From 5a55ae1b13497d1ae78ff01596f4342dce16d9be Mon Sep 17 00:00:00 2001
From: WPT Sync Bot <josh+wptsync@joshmatthews.net>
Date: Tue, 25 Feb 2020 08:19:47 +0000
Subject: [PATCH] Update web-platform-tests to revision
 2be2d7e3abcde5baded3448b85d0bb88e58d3cf7

---
 ...ern.image.nonexistent-but-loading.html.ini |    4 +
 .../2d.pattern.image.nonexistent.html.ini     |    4 +
 .../2d.pattern.image.nosrc.html.ini           |    4 +
 .../2d.pattern.svgimage.nonexistent.html.ini  |    4 +
 .../2d.pattern.svgimage.zeroheight.html.ini   |    4 +
 .../2d.pattern.svgimage.zerowidth.html.ini    |    4 +
 .../url/url-in-tags-revoke.window.js.ini      |    4 +-
 tests/wpt/metadata/MANIFEST.json              | 1370 ++++++-----
 .../WebCryptoAPI/idlharness.https.any.js.ini  |  237 +-
 .../idlharness.tentative.https.window.js.ini  |   24 +-
 .../CSS2/floats/hit-test-floats-002.html.ini  |    4 -
 ....html.ini => hit-test-floats-004.html.ini} |    2 +-
 .../css/css-fonts/idlharness.html.ini         |    3 +
 .../text-decoration-skip-ink-005.html.ini     |    2 +
 .../text-decoration-skip-ink.html.ini         |    3 +
 .../transform-scale-hittest.html.ini          |    3 -
 ...on-from-ua-to-blocking-stylesheet.html.ini |    2 +-
 .../minmax-number-computed.html.ini           |    6 +
 .../css/cssom-view/CaretPosition-001.html.ini |    4 +
 ...ryList-addListener-removeListener.html.ini |    3 +
 .../elementsFromPoint-iframes.html.ini        |    3 -
 .../elementsFromPoint-invalid-cases.html.ini  |    4 -
 .../css/cssom-view/idlharness.html.ini        |  190 ++
 .../metadata/css/cssom/idlharness.html.ini    |   45 +
 .../metadata/css/geometry/interfaces.html.ini |   31 +
 .../css/geometry/interfaces.worker.js.ini     |   31 +
 tests/wpt/metadata/dom/idlharness.any.js.ini  |   15 +
 .../wpt/metadata/dom/idlharness.window.js.ini |  119 +
 ...ia-attribute-reflection.tentative.html.ini |    3 +
 .../api/cors/data-url-shared-worker.html.ini  |   10 +
 .../fetch/api/cors/data-url-worker.html.ini   |    4 +
 .../metadata/fetch/api/idlharness.any.js.ini  |   12 +
 .../fetch/content-type/response.window.js.ini |   17 +-
 .../nosniff/parsing-nosniff.window.js.ini     |    6 +
 ...mbedded-credentials.tentative.sub.html.ini |    3 +-
 .../fullscreen/idlharness.window.js.ini       |    3 +
 .../traverse_the_history_1.html.ini           |    4 -
 .../traverse_the_history_4.html.ini           |    4 +
 .../traverse_the_history_5.html.ini           |    4 +
 .../origin/origin-of-data-document.html.ini   |    4 +
 ...ocument_domain_access_details.sub.html.ini |   25 +-
 ...main_feature_policy.tentative.sub.html.ini |    4 +
 .../sandbox-disallow-same-origin.html.ini     |    4 +
 .../html/dom/idlharness.https.html.ini        |  178 ++
 .../html/dom/idlharness.worker.js.ini         |  108 +-
 .../blob-data.https.html.ini                  |   26 +
 .../skip-document-with-fragment.html.ini      |    4 +
 .../supported-elements.html.ini               |   12 +-
 .../img-empty-alt-replaced.html.ini           |    4 +
 ...rame_sandbox_popups_nonescaping-3.html.ini |    2 +-
 .../script-onerror-insertion-point-2.html.ini |    2 +
 .../webaudio/idlharness.https.window.js.ini   |  165 ++
 .../audiobuffersource-multi-channels.html.ini |    3 +
 .../sub-sample-buffer-stitching.html.ini      |    6 +
 .../wpt/metadata/webgl/idlharness.any.js.ini  |   24 +
 .../broadcastchannel/basics.html.ini          |    4 +
 .../webmessaging/without-ports/017.html.ini   |    5 -
 .../webmessaging/without-ports/018.html.ini   |    5 -
 .../websockets/constructor/009.html.ini       |    5 +
 .../websockets/constructor/022.html.ini       |    5 +
 .../metadata/websockets/cookies/005.html.ini  |    1 +
 .../003-sets-origin.worker.js.ini             |    2 +
 .../websockets/opening-handshake/003.html.ini |    5 +
 .../websockets/opening-handshake/005.html.ini |    5 +
 .../metadata/webvr/idlharness.https.html.ini  |    3 +
 .../dom-overlay/ar_dom_overlay.https.html.ini |   18 +
 .../events_session_squeeze.https.html.ini     |    5 +
 .../webxr/idlharness.https.window.js.ini      |    3 +
 .../semantics/multiple-workers/005.html.ini   |    1 +
 ...t-sync-default-feature-policy.sub.html.ini |    4 +
 .../cross-origin-objects.html.ini             |    4 +
 ...pattern.image.nonexistent-but-loading.html |   32 +
 .../2d.pattern.image.nonexistent.html         |   29 +
 .../2d.pattern.image.nosrc.html               |   30 +
 .../2d.pattern.image.zeroheight.html          |   29 +
 .../2d.pattern.image.zerowidth.html           |   29 +
 .../2d.pattern.svgimage.nonexistent.html      |   29 +
 .../2d.pattern.svgimage.zeroheight.html       |   29 +
 .../2d.pattern.svgimage.zerowidth.html        |   29 +
 .../2dcontext/tools/gentestutils.py           |    6 +
 .../2dcontext/tools/tests2d.yaml              |   76 +-
 .../async-interfaces.https.html               |    2 +-
 ...sync-navigator-clipboard-basics.https.html |    2 +-
 .../async-raw-write-read.tentative.https.html |    2 +-
 ...c-write-blobs-read-blobs-manual.https.html |    2 +-
 ...c-write-image-read-image-manual.https.html |    2 +-
 .../clipboard-events-synthetic.html           |    2 +-
 .../clipboard-apis/clipboard-item.https.html  |    2 +-
 .../clipboard-on-detached-iframe.https.html   |    2 +-
 ...read-on-detaching-iframe-manual.https.html |    2 +-
 ...rite-on-detaching-iframe-manual.https.html |    2 +-
 ...-read-on-detached-iframe-manual.https.html |    2 +-
 ...dText-on-detached-iframe-manual.https.html |    2 +-
 .../events/copy-event-manual.html             |    2 +-
 .../events/cut-event-manual.html              |    2 +-
 .../events/paste-event-manual.html            |    2 +-
 .../async-write-read-manual.https.html        |    2 +-
 .../async-write-readText-manual.https.html    |    2 +-
 .../async-writeText-read-manual.https.html    |    2 +-
 ...async-writeText-readText-manual.https.html |    2 +-
 .../nonce-hiding/nonces.html                  |    2 +-
 .../nonce-hiding/script-nonces-hidden.html    |    6 +-
 .../svgscript-nonces-hidden-meta.sub.html     |    4 +-
 .../nonce-hiding/svgscript-nonces-hidden.html |    2 +-
 .../css-flexbox/padding-overflow-crash.html   |   10 +
 .../percentage-heights-004-ref.html           |    8 +-
 .../css-flexbox/percentage-heights-004.html   |   11 +-
 .../css/css-page/page-size-011.xht            |   20 +
 .../css/css-page/page-size-012.xht            |   20 +
 .../text-decoration-skip-ink-005-notref.html  |   22 +
 .../text-decoration-skip-ink-005.html         |   27 +
 .../text-decoration-skip-ink.html             |    4 +-
 .../css-values/minmax-number-computed.html    |    4 +
 .../cssom/CSSStyleSheet-constructable.html    |   37 +-
 .../attribute-case/syntax.html                |    2 +-
 .../check-for-references.sh                   |    2 +-
 .../contain/reftest.list                      |    7 -
 .../multicol3/reftest.list                    |    6 -
 .../mozilla-central-reftests/sync-tests.sh    |    2 +-
 .../custom-element-registry/define.html       |   10 +-
 .../reactions/with-exceptions.html            |    6 +-
 ...ic-markup-insertion-counter-construct.html |   10 +-
 ...ic-markup-insertion-counter-reactions.html |   10 +-
 .../docs/writing-tests/testharness-api.md     |    6 +-
 .../events/scrolling/overscroll-deltas.html   |    4 +-
 .../dom/nodes/Document-createElement.html     |    5 +-
 .../dom/nodes/Document-createElementNS.html   |    2 +-
 .../dom/nodes/Element-matches.js              |   10 +-
 .../dom/nodes/Node-removeChild.html           |    6 +-
 .../dom/nodes/ParentNode-querySelector-All.js |   12 +-
 .../aria-attribute-reflection.tentative.html  |   11 +
 .../dom/ranges/Range-cloneContents.html       |   10 +-
 .../dom/ranges/Range-extractContents.html     |   10 +-
 .../dom/ranges/Range-insertNode.html          |    2 +-
 .../dom/ranges/Range-surroundContents.html    |    2 +-
 .../serviceworker-intercepted.https.html      |    8 +-
 .../fetch/api/cors/data-url-iframe.html       |   58 +
 .../api/cors/data-url-shared-worker.html      |   53 +
 .../fetch/api/cors/data-url-worker.html       |   50 +
 .../forced-colors-mode-18-ref.html            |   36 +
 .../forced-colors-mode-18.html                |   33 +
 .../forced-colors-mode-18.tentative-ref.html  |   28 -
 .../forced-colors-mode-18.tentative.html      |   27 -
 .../forced-colors-mode-26-ref.html            |   15 +
 .../forced-colors-mode-26.html                |   20 +
 .../forced-colors-mode-26.tentative-ref.html  |   16 -
 .../forced-colors-mode-26.tentative.html      |   23 -
 ...hor-fragment-form-submit-longfragment.html |   29 +
 .../anchor-fragment-form-submit-withpath.html |   35 +
 .../anchor-fragment-form-submit.html          |   29 +
 .../navigating-across-documents/form.html     |    5 +
 .../history/the-history-interface/001.html    |    6 +-
 .../history/the-history-interface/002.html    |    6 +-
 .../document_domain_setter.html               |    3 +-
 .../none.https.html                           |   19 +
 .../require-corp.https.html                   |   79 +
 .../navigate-require-corp-same-site.sub.html  |   29 +
 ...te-require-corp-same-site.sub.html.headers |    2 +
 .../shared-array-buffers/blob-data.https.html |  131 ++
 .../blob-data.https.html.headers              |    2 +
 .../img-empty-alt-replaced.html               |   23 +
 .../the-input-element/maxlength-number.html   |   19 +
 ...t-exception-vs-return-origin.sub.window.js |   44 +-
 .../bailout-exception-vs-return-xml.window.js |    4 +-
 ...e-effects-same-origin-domain.sub.window.js |    2 +-
 .../bailout-side-effects-xml.window.js        |   11 +-
 ...-document-open-same-origin-domain.sub.html |   10 +-
 .../context-creation-offscreen.html           |    2 +-
 .../interfaces/css-font-loading.idl           |   15 +-
 .../interfaces/cssom-view.idl                 |    4 +-
 .../interfaces/resize-observer.idl            |    7 +-
 .../interfaces/scroll-animations.idl          |    4 +-
 .../interfaces/visual-viewport.idl            |    1 +
 .../interfaces/web-bluetooth.idl              |    3 +-
 .../interfaces/webaudio.idl                   |    4 -
 tests/wpt/web-platform-tests/lint.whitelist   |    1 +
 ...o-disconnect-removes-observed-types.any.js |   19 +
 .../po-observe-repeated-type.any.js           |   17 +
 .../portals/about-blank-cannot-host.html      |    1 +
 .../portals/csp/frame-src.sub.html            |    4 +-
 .../history-manipulation-inside-portal.html   |    6 +
 ...ment-event-handler-content-attributes.html |    1 +
 .../portals/portal-activate-data.html         |    1 +
 .../portals/portal-activate-event.html        |    3 +
 .../portals/portal-non-http-navigation.html   |    3 +
 .../portals/portal-onload-event.html          |    1 +
 ...rtals-activate-empty-browsing-context.html |    2 +
 .../portals-activate-inside-iframe.html       |    1 +
 .../portals-activate-inside-portal.html       |    1 +
 .../portals-activate-no-browsing-context.html |    1 +
 .../portals/portals-activate-resolution.html  |    1 +
 .../portals/portals-activate-twice.html       |    2 +
 .../portals/portals-adopt-predecessor.html    |    7 +
 .../portals-cross-origin-load.sub.html        |    1 +
 .../portals/portals-focus.sub.html            |    1 +
 .../portals/portals-host-exposure.sub.html    |    1 +
 .../portals-host-hidden-after-activation.html |    1 +
 .../portals-host-post-message.sub.html        |    4 +
 .../portals-navigate-after-adoption.html      |    1 +
 .../portals/portals-nested.html               |    1 +
 .../portals/portals-post-message.sub.html     |    4 +
 .../portals-referrer-inherit-header.html      |    2 +-
 .../portals-referrer-inherit-meta.html        |    2 +-
 .../portals/portals-referrer.html             |    6 +-
 .../portals/portals-rendering.html            |   31 +-
 .../portals/portals-repeated-activate.html    |    3 +-
 .../portals-set-src-after-activate.html       |    1 +
 .../portals/predecessor-fires-unload.html     |    2 +
 .../portals/xfo/portals-xfo-deny.sub.html     |    2 +
 .../resize-observer/observe.html              |  133 ++
 .../wpt/web-platform-tests/resources/LICENSE  |   30 -
 .../resources/chromium/webxr-test.js          |   25 +
 .../resources/idlharness.js                   |   58 +-
 .../test/tests/functional/api-tests-1.html    |   51 +-
 .../unit/IdlInterfaceMember/toString.html     |   36 +
 .../resources/testharness.js                  |   93 +-
 .../scroll-animations/scroll-animation.html   |   24 +
 .../scroll-to-text-fragment-target.html       |    6 +-
 .../scroll-to-text-fragment.html              |    6 +
 .../detached-context.https.html               |    2 +
 .../fetch-event-handled.https.html            |   82 +
 .../service-worker/multipart-image.https.html |    5 +-
 .../resources/fetch-event-handled-worker.js   |   41 +
 .../shadow-dom/untriaged/LICENSE              |  107 -
 .../web-platform-tests/tools/localpaths.py    |    2 +-
 .../tools/pywebsocket/CONTRIBUTING            |   11 -
 .../tools/pywebsocket/README                  |   17 -
 .../tools/pywebsocket/README.md               |    8 -
 .../tools/pywebsocket/example/cookie_wsh.py   |   32 -
 .../tools/pywebsocket/example/echo_client.py  | 1129 ---------
 .../pywebsocket/example/fetch_benchmark.html  |  163 --
 .../pywebsocket/example/fetch_benchmark.js    |  225 --
 .../fetch_performance_test_iframe.html        |    6 -
 .../example/performance_test_iframe.html      |    6 -
 .../example/performance_test_iframe.js        |   66 -
 .../pywebsocket/example/pywebsocket.conf      |   42 -
 .../tools/pywebsocket/example/util_main.js    |   65 -
 .../tools/pywebsocket/example/util_worker.js  |   20 -
 .../pywebsocket/example/xhr_benchmark.html    |  212 --
 .../pywebsocket/example/xhr_benchmark.js      |  292 ---
 .../pywebsocket/example/xhr_event_logger.html |  123 -
 .../example/xhr_performance_test_iframe.html  |    6 -
 .../mod_pywebsocket/_stream_base.py           |  181 --
 .../mod_pywebsocket/_stream_hixie75.py        |  229 --
 .../mod_pywebsocket/handshake/hybi00.py       |  293 ---
 .../mod_pywebsocket/headerparserhandler.py    |  257 --
 .../tools/pywebsocket/mod_pywebsocket/mux.py  | 1885 ---------------
 .../pywebsocket/mod_pywebsocket/standalone.py | 1208 ----------
 .../pywebsocket/mod_pywebsocket/stream.py     |   56 -
 .../mod_pywebsocket/xhr_benchmark_handler.py  |  121 -
 .../pywebsocket/test/client_for_testing.py    | 1100 ---------
 .../test/mux_client_for_testing.py            |  690 ------
 .../pywebsocket/test/test_handshake_hybi00.py |  516 ----
 .../tools/pywebsocket/test/test_msgutil.py    | 1347 -----------
 .../tools/pywebsocket/test/test_mux.py        | 2088 -----------------
 .../pywebsocket/test/test_stream_hixie75.py   |   59 -
 .../web-platform-tests/tools/serve/serve.py   |   14 +-
 .../third_party/pywebsocket3/.travis.yml      |   17 +
 .../third_party/pywebsocket3/CONTRIBUTING     |   30 +
 .../pywebsocket3}/LICENSE                     |    2 +-
 .../pywebsocket3}/MANIFEST.in                 |    0
 .../tools/third_party/pywebsocket3/README.md  |   36 +
 .../example/abort_handshake_wsh.py            |    2 +-
 .../pywebsocket3}/example/abort_wsh.py        |    2 +-
 .../example/arraybuffer_benchmark.html        |    0
 .../pywebsocket3}/example/bench_wsh.py        |    7 +-
 .../pywebsocket3}/example/benchmark.html      |    2 +-
 .../pywebsocket3}/example/benchmark.js        |   32 +-
 .../example/benchmark_helper_wsh.py           |   19 +-
 .../pywebsocket3}/example/close_wsh.py        |    1 +
 .../pywebsocket3}/example/console.html        |    0
 .../pywebsocket3/example/cookie_wsh.py}       |   40 +-
 .../pywebsocket3/example/echo_client.py       |  696 ++++++
 .../pywebsocket3}/example/echo_noext_wsh.py   |    3 +-
 .../pywebsocket3}/example/echo_wsh.py         |    3 +-
 .../pywebsocket3}/example/handler_map.txt     |    0
 .../pywebsocket3}/example/hsts_wsh.py         |    0
 .../example/internal_error_wsh.py             |    2 +-
 .../pywebsocket3}/example/origin_check_wsh.py |    0
 .../example/performance_test_iframe.html}     |   47 +-
 .../example/performance_test_iframe.js        |   86 +
 .../pywebsocket3}/example/special_headers.cgi |    2 -
 .../pywebsocket3}/example/util.js             |    8 +-
 .../pywebsocket3/example/util_main.js         |   89 +
 .../pywebsocket3/example/util_worker.js       |   44 +
 .../pywebsocket3}/mod_pywebsocket/__init__.py |   90 +-
 .../mod_pywebsocket/_stream_exceptions.py}    |   71 +-
 .../pywebsocket3}/mod_pywebsocket/common.py   |   45 +-
 .../pywebsocket3}/mod_pywebsocket/dispatch.py |   82 +-
 .../mod_pywebsocket/extensions.py             |  395 +---
 .../mod_pywebsocket/fast_masking.i            |    0
 .../mod_pywebsocket/handshake/__init__.py     |   19 +-
 .../mod_pywebsocket/handshake/_base.py        |   21 +-
 .../mod_pywebsocket/handshake/hybi.py         |  179 +-
 .../mod_pywebsocket/http_header_util.py       |   27 +-
 .../mod_pywebsocket/memorizingfile.py         |   13 +-
 .../pywebsocket3}/mod_pywebsocket/msgutil.py  |   25 +-
 .../mod_pywebsocket/request_handler.py        |  319 +++
 .../mod_pywebsocket/server_util.py            |   87 +
 .../mod_pywebsocket/standalone.py             |  478 ++++
 .../pywebsocket3/mod_pywebsocket/stream.py}   |  306 ++-
 .../pywebsocket3}/mod_pywebsocket/util.py     |  119 +-
 .../mod_pywebsocket/websocket_server.py       |  285 +++
 .../pywebsocket3}/setup.py                    |   54 +-
 .../pywebsocket3}/test/__init__.py            |    0
 .../pywebsocket3}/test/cert/cacert.pem        |    0
 .../pywebsocket3}/test/cert/cert.pem          |    0
 .../pywebsocket3}/test/cert/client_cert.p12   |  Bin
 .../pywebsocket3}/test/cert/key.pem           |    0
 .../pywebsocket3/test/client_for_testing.py   |  719 ++++++
 .../pywebsocket3}/test/mock.py                |   68 +-
 .../pywebsocket3}/test/run_all.py             |   30 +-
 .../pywebsocket3}/test/set_sys_path.py        |    6 +-
 .../pywebsocket3}/test/test_dispatch.py       |  198 +-
 .../pywebsocket3}/test/test_endtoend.py       |  449 ++--
 .../pywebsocket3}/test/test_extensions.py     |   95 +-
 .../pywebsocket3}/test/test_handshake.py      |   76 +-
 .../pywebsocket3}/test/test_handshake_hybi.py |  265 +--
 .../test/test_http_header_util.py             |   23 +-
 .../pywebsocket3}/test/test_memorizingfile.py |   24 +-
 .../pywebsocket3}/test/test_mock.py           |   56 +-
 .../pywebsocket3/test/test_msgutil.py         |  916 ++++++++
 .../pywebsocket3}/test/test_stream.py         |   29 +-
 .../pywebsocket3}/test/test_util.py           |  123 +-
 .../pywebsocket3}/test/testdata/README        |    0
 .../testdata/handlers/abort_by_user_wsh.py    |    1 -
 .../test/testdata/handlers/blank_wsh.py       |    1 -
 .../testdata/handlers/origin_check_wsh.py     |    5 +-
 .../handlers/sub/exception_in_transfer_wsh.py |    2 -
 .../handlers/sub/no_wsh_at_the_end.py         |    8 +-
 .../testdata/handlers/sub/non_callable_wsh.py |    4 -
 .../test/testdata/handlers/sub/plain_wsh.py   |    5 +-
 .../handlers/sub/wrong_handshake_sig_wsh.py   |    8 +-
 .../handlers/sub/wrong_transfer_sig_wsh.py    |    8 +-
 .../pywebsocket3}/test/testdata/hello.pl      |    0
 .../tools/webdriver/webdriver/client.py       |    4 +-
 .../tools/webdriver/webdriver/transport.py    |   20 +-
 .../tools/wptrunner/LICENSE                   |   30 -
 .../wptrunner/wptrunner/executors/base.py     |   12 +-
 .../wptrunner/executors/executorwebdriver.py  |   12 +-
 .../tools/wptrunner/wptrunner/update/sync.py  |   41 -
 .../web-platform-tests/tools/wptserve/LICENSE |   30 -
 .../tests/functional/test_response.py         |   14 +-
 .../web-nfc/NDEFRecord_constructor.https.html |   97 +-
 ...ecredential-badargs-attestation.https.html |    4 +-
 ...dential-badargs-authnrselection.https.html |   27 +-
 ...atecredential-badargs-challenge.https.html |    4 +-
 .../createcredential-badargs-rp.https.html    |    4 +-
 .../createcredential-badargs-user.https.html  |    2 +
 ...tecredential-excludecredentials.https.html |    2 +
 .../createcredential-extensions.https.html    |    2 +
 .../createcredential-passing.https.html       |    4 +-
 ...eatecredential-pubkeycredparams.https.html |   12 +-
 .../createcredential-timeout.https.html       |   71 +-
 .../getcredential-badargs-rpid.https.html     |    4 +-
 ...ential-badargs-userverification.https.html |    6 +-
 .../getcredential-extensions.https.html       |    2 +
 .../webauthn/getcredential-passing.https.html |    4 +-
 .../webauthn/getcredential-timeout.https.html |   64 +-
 .../web-platform-tests/webauthn/helpers.js    |   64 +-
 .../webauthn/securecontext.http.html          |   56 +-
 .../webauthn/securecontext.https.html         |   30 +-
 .../webmessaging/broadcastchannel/basics.html |   16 +-
 .../webmessaging/postMessage_Document.htm     |    2 +-
 .../webmessaging/postMessage_Function.htm     |    2 +-
 .../postMessage_dup_transfer_objects.htm      |    2 +-
 .../postMessage_invalid_targetOrigin.htm      |    2 +-
 ...RTCPeerConnection-onnegotiationneeded.html |   22 +
 ...nection-setRemoteDescription-rollback.html |   15 +
 .../webrtc/protocol/ice-ufragpwd.html         |   55 +
 .../handlers/simple_handshake_wsh.py          |    2 +-
 .../dom-overlay/ar_dom_overlay.https.html     |  202 +-
 .../webxr/events_session_squeeze.https.html   |  137 ++
 .../workers/Worker-constructor-proto.any.js   |    4 +-
 .../xhr/open-url-multi-window-2.htm           |    9 +-
 .../xhr/open-url-multi-window-3.htm           |    7 +-
 .../xhr/open-url-multi-window-5.htm           |    8 +-
 377 files changed, 9772 insertions(+), 15950 deletions(-)
 create mode 100644 tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.pattern.image.nonexistent-but-loading.html.ini
 create mode 100644 tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.pattern.image.nonexistent.html.ini
 create mode 100644 tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.pattern.image.nosrc.html.ini
 create mode 100644 tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.pattern.svgimage.nonexistent.html.ini
 create mode 100644 tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.pattern.svgimage.zeroheight.html.ini
 create mode 100644 tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.pattern.svgimage.zerowidth.html.ini
 delete mode 100644 tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini
 rename tests/wpt/metadata/css/CSS2/floats/{hit-test-floats-003.html.ini => hit-test-floats-004.html.ini} (67%)
 create mode 100644 tests/wpt/metadata/css/css-text-decor/text-decoration-skip-ink-005.html.ini
 create mode 100644 tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
 delete mode 100644 tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
 create mode 100644 tests/wpt/metadata/fetch/api/cors/data-url-shared-worker.html.ini
 create mode 100644 tests/wpt/metadata/fetch/api/cors/data-url-worker.html.ini
 delete mode 100644 tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/origin-of-data-document.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/sandboxing/sandbox-disallow-same-origin.html.ini
 create mode 100644 tests/wpt/metadata/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/blob-data.https.html.ini
 create mode 100644 tests/wpt/metadata/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-empty-alt-replaced.html.ini
 create mode 100644 tests/wpt/metadata/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini
 create mode 100644 tests/wpt/metadata/webmessaging/broadcastchannel/basics.html.ini
 delete mode 100644 tests/wpt/metadata/webmessaging/without-ports/017.html.ini
 delete mode 100644 tests/wpt/metadata/webmessaging/without-ports/018.html.ini
 create mode 100644 tests/wpt/metadata/websockets/constructor/009.html.ini
 create mode 100644 tests/wpt/metadata/websockets/constructor/022.html.ini
 create mode 100644 tests/wpt/metadata/websockets/opening-handshake/003-sets-origin.worker.js.ini
 create mode 100644 tests/wpt/metadata/websockets/opening-handshake/003.html.ini
 create mode 100644 tests/wpt/metadata/websockets/opening-handshake/005.html.ini
 create mode 100644 tests/wpt/metadata/webxr/events_session_squeeze.https.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/cross-origin-objects/cross-origin-objects.html.ini
 create mode 100644 tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.pattern.image.nonexistent-but-loading.html
 create mode 100644 tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.pattern.image.nonexistent.html
 create mode 100644 tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.pattern.image.nosrc.html
 create mode 100644 tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.pattern.image.zeroheight.html
 create mode 100644 tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.pattern.image.zerowidth.html
 create mode 100644 tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.pattern.svgimage.nonexistent.html
 create mode 100644 tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.pattern.svgimage.zeroheight.html
 create mode 100644 tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.pattern.svgimage.zerowidth.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-flexbox/padding-overflow-crash.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-page/page-size-011.xht
 create mode 100644 tests/wpt/web-platform-tests/css/css-page/page-size-012.xht
 create mode 100644 tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-skip-ink-005-notref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-ink-005.html
 create mode 100644 tests/wpt/web-platform-tests/fetch/api/cors/data-url-iframe.html
 create mode 100644 tests/wpt/web-platform-tests/fetch/api/cors/data-url-shared-worker.html
 create mode 100644 tests/wpt/web-platform-tests/fetch/api/cors/data-url-worker.html
 create mode 100644 tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-18-ref.html
 create mode 100644 tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-18.html
 delete mode 100644 tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-18.tentative-ref.html
 delete mode 100644 tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-18.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-26-ref.html
 create mode 100644 tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-26.html
 delete mode 100644 tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-26.tentative-ref.html
 delete mode 100644 tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-26.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/anchor-fragment-form-submit-longfragment.html
 create mode 100644 tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/anchor-fragment-form-submit-withpath.html
 create mode 100644 tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/anchor-fragment-form-submit.html
 create mode 100644 tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/form.html
 create mode 100644 tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/navigate-require-corp-same-site.sub.html
 create mode 100644 tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/navigate-require-corp-same-site.sub.html.headers
 create mode 100644 tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/blob-data.https.html
 create mode 100644 tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/blob-data.https.html.headers
 create mode 100644 tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-empty-alt-replaced.html
 create mode 100644 tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/maxlength-number.html
 create mode 100644 tests/wpt/web-platform-tests/performance-timeline/po-disconnect-removes-observed-types.any.js
 create mode 100644 tests/wpt/web-platform-tests/performance-timeline/po-observe-repeated-type.any.js
 delete mode 100644 tests/wpt/web-platform-tests/resources/LICENSE
 create mode 100644 tests/wpt/web-platform-tests/resources/test/tests/unit/IdlInterfaceMember/toString.html
 create mode 100644 tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-handled.https.html
 create mode 100644 tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-handled-worker.js
 delete mode 100644 tests/wpt/web-platform-tests/shadow-dom/untriaged/LICENSE
 delete mode 100644 tests/wpt/web-platform-tests/tools/pywebsocket/CONTRIBUTING
 delete mode 100644 tests/wpt/web-platform-tests/tools/pywebsocket/README
 delete mode 100644 tests/wpt/web-platform-tests/tools/pywebsocket/README.md
 delete mode 100644 tests/wpt/web-platform-tests/tools/pywebsocket/example/cookie_wsh.py
 delete mode 100755 tests/wpt/web-platform-tests/tools/pywebsocket/example/echo_client.py
 delete mode 100644 tests/wpt/web-platform-tests/tools/pywebsocket/example/fetch_benchmark.html
 delete mode 100644 tests/wpt/web-platform-tests/tools/pywebsocket/example/fetch_benchmark.js
 delete mode 100644 tests/wpt/web-platform-tests/tools/pywebsocket/example/fetch_performance_test_iframe.html
 delete mode 100644 tests/wpt/web-platform-tests/tools/pywebsocket/example/performance_test_iframe.html
 delete mode 100644 tests/wpt/web-platform-tests/tools/pywebsocket/example/performance_test_iframe.js
 delete mode 100644 tests/wpt/web-platform-tests/tools/pywebsocket/example/pywebsocket.conf
 delete mode 100644 tests/wpt/web-platform-tests/tools/pywebsocket/example/util_main.js
 delete mode 100644 tests/wpt/web-platform-tests/tools/pywebsocket/example/util_worker.js
 delete mode 100644 tests/wpt/web-platform-tests/tools/pywebsocket/example/xhr_benchmark.html
 delete mode 100644 tests/wpt/web-platform-tests/tools/pywebsocket/example/xhr_benchmark.js
 delete mode 100644 tests/wpt/web-platform-tests/tools/pywebsocket/example/xhr_event_logger.html
 delete mode 100644 tests/wpt/web-platform-tests/tools/pywebsocket/example/xhr_performance_test_iframe.html
 delete mode 100644 tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/_stream_base.py
 delete mode 100644 tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/_stream_hixie75.py
 delete mode 100644 tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/handshake/hybi00.py
 delete mode 100644 tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/headerparserhandler.py
 delete mode 100644 tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/mux.py
 delete mode 100755 tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/standalone.py
 delete mode 100644 tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/stream.py
 delete mode 100644 tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/xhr_benchmark_handler.py
 delete mode 100644 tests/wpt/web-platform-tests/tools/pywebsocket/test/client_for_testing.py
 delete mode 100644 tests/wpt/web-platform-tests/tools/pywebsocket/test/mux_client_for_testing.py
 delete mode 100755 tests/wpt/web-platform-tests/tools/pywebsocket/test/test_handshake_hybi00.py
 delete mode 100755 tests/wpt/web-platform-tests/tools/pywebsocket/test/test_msgutil.py
 delete mode 100644 tests/wpt/web-platform-tests/tools/pywebsocket/test/test_mux.py
 delete mode 100755 tests/wpt/web-platform-tests/tools/pywebsocket/test/test_stream_hixie75.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/.travis.yml
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/CONTRIBUTING
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/LICENSE (98%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/MANIFEST.in (100%)
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/README.md
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/example/abort_handshake_wsh.py (97%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/example/abort_wsh.py (97%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/example/arraybuffer_benchmark.html (100%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/example/bench_wsh.py (96%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/example/benchmark.html (99%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/example/benchmark.js (75%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/example/benchmark_helper_wsh.py (88%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/example/close_wsh.py (98%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/example/console.html (100%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket/example/eventsource.cgi => third_party/pywebsocket3/example/cookie_wsh.py} (65%)
 mode change 100755 => 100644
 create mode 100755 tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/echo_client.py
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/example/echo_noext_wsh.py (97%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/example/echo_wsh.py (97%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/example/handler_map.txt (100%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/example/hsts_wsh.py (100%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/example/internal_error_wsh.py (97%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/example/origin_check_wsh.py (100%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket/example/eventsource.html => third_party/pywebsocket3/example/performance_test_iframe.html} (59%)
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/performance_test_iframe.js
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/example/special_headers.cgi (99%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/example/util.js (97%)
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/util_main.js
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/util_worker.js
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/mod_pywebsocket/__init__.py (63%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket/test/endtoend_with_external_server.py => third_party/pywebsocket3/mod_pywebsocket/_stream_exceptions.py} (52%)
 mode change 100755 => 100644
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/mod_pywebsocket/common.py (88%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/mod_pywebsocket/dispatch.py (86%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/mod_pywebsocket/extensions.py (55%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/mod_pywebsocket/fast_masking.i (100%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/mod_pywebsocket/handshake/__init__.py (89%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/mod_pywebsocket/handshake/_base.py (93%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/mod_pywebsocket/handshake/hybi.py (71%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/mod_pywebsocket/http_header_util.py (92%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/mod_pywebsocket/memorizingfile.py (96%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/mod_pywebsocket/msgutil.py (93%)
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/request_handler.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/server_util.py
 create mode 100755 tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/standalone.py
 rename tests/wpt/web-platform-tests/tools/{pywebsocket/mod_pywebsocket/_stream_hybi.py => third_party/pywebsocket3/mod_pywebsocket/stream.py} (76%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/mod_pywebsocket/util.py (83%)
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/websocket_server.py
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/setup.py (62%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/test/__init__.py (100%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/test/cert/cacert.pem (100%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/test/cert/cert.pem (100%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/test/cert/client_cert.p12 (100%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/test/cert/key.pem (100%)
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/client_for_testing.py
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/test/mock.py (82%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/test/run_all.py (81%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/test/set_sys_path.py (97%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/test/test_dispatch.py (62%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/test/test_endtoend.py (57%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/test/test_extensions.py (69%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/test/test_handshake.py (78%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/test/test_handshake_hybi.py (62%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/test/test_http_header_util.py (86%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/test/test_memorizingfile.py (88%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/test/test_mock.py (76%)
 create mode 100755 tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_msgutil.py
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/test/test_stream.py (76%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/test/test_util.py (60%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/test/testdata/README (100%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/test/testdata/handlers/abort_by_user_wsh.py (99%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/test/testdata/handlers/blank_wsh.py (99%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/test/testdata/handlers/origin_check_wsh.py (91%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/test/testdata/handlers/sub/exception_in_transfer_wsh.py (99%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/test/testdata/handlers/sub/no_wsh_at_the_end.py (90%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/test/testdata/handlers/sub/non_callable_wsh.py (99%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/test/testdata/handlers/sub/plain_wsh.py (88%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/test/testdata/handlers/sub/wrong_handshake_sig_wsh.py (90%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/test/testdata/handlers/sub/wrong_transfer_sig_wsh.py (90%)
 rename tests/wpt/web-platform-tests/tools/{pywebsocket => third_party/pywebsocket3}/test/testdata/hello.pl (100%)
 delete mode 100644 tests/wpt/web-platform-tests/tools/wptrunner/LICENSE
 delete mode 100644 tests/wpt/web-platform-tests/tools/wptserve/LICENSE
 create mode 100644 tests/wpt/web-platform-tests/webrtc/protocol/ice-ufragpwd.html
 create mode 100644 tests/wpt/web-platform-tests/webxr/events_session_squeeze.https.html

diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.pattern.image.nonexistent-but-loading.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.pattern.image.nonexistent-but-loading.html.ini
new file mode 100644
index 00000000000..79f39c53155
--- /dev/null
+++ b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.pattern.image.nonexistent-but-loading.html.ini
@@ -0,0 +1,4 @@
+[2d.pattern.image.nonexistent-but-loading.html]
+  [Canvas test: 2d.pattern.image.nonexistent-but-loading]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.pattern.image.nonexistent.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.pattern.image.nonexistent.html.ini
new file mode 100644
index 00000000000..d1cbf15e597
--- /dev/null
+++ b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.pattern.image.nonexistent.html.ini
@@ -0,0 +1,4 @@
+[2d.pattern.image.nonexistent.html]
+  [Canvas test: 2d.pattern.image.nonexistent]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.pattern.image.nosrc.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.pattern.image.nosrc.html.ini
new file mode 100644
index 00000000000..27fe75b75e7
--- /dev/null
+++ b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.pattern.image.nosrc.html.ini
@@ -0,0 +1,4 @@
+[2d.pattern.image.nosrc.html]
+  [Canvas test: 2d.pattern.image.nosrc]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.pattern.svgimage.nonexistent.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.pattern.svgimage.nonexistent.html.ini
new file mode 100644
index 00000000000..c6ac9ddf165
--- /dev/null
+++ b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.pattern.svgimage.nonexistent.html.ini
@@ -0,0 +1,4 @@
+[2d.pattern.svgimage.nonexistent.html]
+  [Canvas test: 2d.pattern.svgimage.nonexistent]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.pattern.svgimage.zeroheight.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.pattern.svgimage.zeroheight.html.ini
new file mode 100644
index 00000000000..50d7ad171fb
--- /dev/null
+++ b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.pattern.svgimage.zeroheight.html.ini
@@ -0,0 +1,4 @@
+[2d.pattern.svgimage.zeroheight.html]
+  [Canvas test: 2d.pattern.svgimage.zeroheight]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.pattern.svgimage.zerowidth.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.pattern.svgimage.zerowidth.html.ini
new file mode 100644
index 00000000000..40ca3dd584e
--- /dev/null
+++ b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.pattern.svgimage.zerowidth.html.ini
@@ -0,0 +1,4 @@
+[2d.pattern.svgimage.zerowidth.html]
+  [Canvas test: 2d.pattern.svgimage.zerowidth]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
index 76b398963ae..fc007d26cb3 100644
--- a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
+++ b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
@@ -10,10 +10,10 @@
     expected: FAIL
 
   [Opening a blob URL in a noopener about:blank window immediately before revoking it works.]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Opening a blob URL in a new window by clicking an <a> tag works immediately before revoking the URL.]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Fetching a blob URL immediately before revoking it works in <script> tags.]
     expected: TIMEOUT
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index ce655a6864c..f04c3749914 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -61,6 +61,13 @@
      ]
     },
     "css-flexbox": {
+     "padding-overflow-crash.html": [
+      "fd0c333fabadb073b9977a63de6a8c5c3ed79042",
+      [
+       null,
+       {}
+      ]
+     ],
      "zero-content-size-with-scrollbar-crash.html": [
       "c38659a9d8cff6d0003793896dc83cc78e7a22c4",
       [
@@ -1868,14 +1875,14 @@
    },
    "clipboard-apis": {
     "async-write-blobs-read-blobs-manual.https.html": [
-     "b5f0f3d9dc13d2b67264b3a61b9f0f8be0cd6ecd",
+     "f53d7f9c36e2b26082d180de227dd1675ca769dc",
      [
       null,
       {}
      ]
     ],
     "async-write-image-read-image-manual.https.html": [
-     "6381b453abfeb11f4ae2d03d511da2ba8d934eb3",
+     "71d14984953974a66f769edf9a3566fe526cdb6f",
      [
       null,
       {}
@@ -1883,28 +1890,28 @@
     ],
     "detached-iframe": {
      "read-on-detaching-iframe-manual.https.html": [
-      "e4a4283c900d974c83b8f438cc64e0dce6d8d2ae",
+      "8361ceff125c69c4b7f79e8dec4e648deeac4f32",
       [
        null,
        {}
       ]
      ],
      "write-on-detaching-iframe-manual.https.html": [
-      "033cc0fd9f1aa05d55abfbcee0677bb533de3faf",
+      "4a3dbd7dc327fcee6b8305b9a837b80d933b0fa7",
       [
        null,
        {}
       ]
      ],
      "write-read-on-detached-iframe-manual.https.html": [
-      "31168092480abdfc51a78bce8b407d408955e636",
+      "af12ff8d880df8f7e8fb72f10bb12ad6acff0060",
       [
        null,
        {}
       ]
      ],
      "writeText-readText-on-detached-iframe-manual.https.html": [
-      "883e8dbd32e4d569a865b4e98d0984251a043709",
+      "c2d8be1ace2528242eb015b37c9da0e11895e857",
       [
        null,
        {}
@@ -1913,21 +1920,21 @@
     },
     "events": {
      "copy-event-manual.html": [
-      "6f687af196fa198cda7d83f468945f9f69330568",
+      "9f9f1950e7cad11da8cc9e8984f130e182d64d64",
       [
        null,
        {}
       ]
      ],
      "cut-event-manual.html": [
-      "c5593171754cfa2bd684e1ff3a8a724283456cbd",
+      "72c11ec3b98a7839ba6ba22b0340664dcc9782c2",
       [
        null,
        {}
       ]
      ],
      "paste-event-manual.html": [
-      "19e6b95c5f32a0eb7dbccb0f5bd538e9dbb1360e",
+      "608a0d6f2323c2bda0a7c5b3a73388c13d706ac1",
       [
        null,
        {}
@@ -1936,28 +1943,28 @@
     },
     "text-write-read": {
      "async-write-read-manual.https.html": [
-      "b374333ca944a5a675f71678f1f30f1216a100d1",
+      "14488b1e71666089981430538596040accb704d0",
       [
        null,
        {}
       ]
      ],
      "async-write-readText-manual.https.html": [
-      "2d78b2f186e3c761549b578555f3ac6c15145221",
+      "c76df06a8b0216b7ae6d1c3944d3b063fb694b4f",
       [
        null,
        {}
       ]
      ],
      "async-writeText-read-manual.https.html": [
-      "4f9fe25bca588d47d4d4d045a8fa3afe0cd44314",
+      "e74726ec5e7f3d37572fd247e85acd91db6e9d77",
       [
        null,
        {}
       ]
      ],
      "async-writeText-readText-manual.https.html": [
-      "48e5adb51d249b0846398a5a742c430809972e87",
+      "d2c43f0b6f20ad516e4058fe51fc8a0d6aa14d4c",
       [
        null,
        {}
@@ -10086,6 +10093,20 @@
        null,
        {}
       ]
+     ],
+     "page-size-011.xht": [
+      "6c9e3bcb11ea8ae2635d7e202c7a1b0ca789aa00",
+      [
+       null,
+       {}
+      ]
+     ],
+     "page-size-012.xht": [
+      "0def30ae455b719335b5b60c701ba2d6f92d2e94",
+      [
+       null,
+       {}
+      ]
      ]
     },
     "css-pseudo": {
@@ -136322,7 +136343,7 @@
       ]
      ],
      "percentage-heights-004.html": [
-      "4f162487a711c78f48bf457d3fb0764bb5f2b746",
+      "3fb0806b63d6b634129d1ba3e804042a762e4d29",
       [
        null,
        [
@@ -173613,6 +173634,19 @@
        {}
       ]
      ],
+     "text-decoration-skip-ink-005.html": [
+      "2d91f73e2ee97d3809eacdfccc43215cd2011655",
+      [
+       null,
+       [
+        [
+         "/css/css-text-decor/reference/text-decoration-skip-ink-005-notref.html",
+         "!="
+        ]
+       ],
+       {}
+      ]
+     ],
      "text-decoration-skip-ink-sidewayslr-001.html": [
       "48d427e238253e26ff18f7b3cbef925e987e8b6a",
       [
@@ -222925,13 +222959,13 @@
       {}
      ]
     ],
-    "forced-colors-mode-18.tentative.html": [
-     "307420af9fc771978c983d728c3537c06aea249f",
+    "forced-colors-mode-18.html": [
+     "435b9e4326f9a012e3f9a0eacc4cb9761477f3f3",
      [
       null,
       [
        [
-        "/forced-colors-mode/forced-colors-mode-18.tentative-ref.html",
+        "/forced-colors-mode/forced-colors-mode-18-ref.html",
         "=="
        ]
       ],
@@ -222977,13 +223011,13 @@
       {}
      ]
     ],
-    "forced-colors-mode-26.tentative.html": [
-     "ac21cae23805ffebd6f8396f56025ba8210a6add",
+    "forced-colors-mode-26.html": [
+     "a9aa59013217ecdc32908330a4c520a761c0d09b",
      [
       null,
       [
        [
-        "/forced-colors-mode/forced-colors-mode-26.tentative-ref.html",
+        "/forced-colors-mode/forced-colors-mode-26-ref.html",
         "=="
        ]
       ],
@@ -229842,7 +229876,7 @@
    },
    "portals": {
     "portals-rendering.html": [
-     "0eae0ddfd6ef1e9de2251f50914a855f4142b9d5",
+     "229dacf4e69962e0cde95658a328ad666c0b487e",
      [
       null,
       [
@@ -236718,7 +236752,7 @@
       []
      ],
      "gentestutils.py": [
-      "bd1e3c75768a2644ad772578e6f6ee2266db7fb9",
+      "64ad669b329584ee59a0c9cc424951de26f1df57",
       []
      ],
      "name2dir.yaml": [
@@ -236742,7 +236776,7 @@
       []
      ],
      "tests2d.yaml": [
-      "6b971a4b2fc5435a8e802a529b1c925baf605860",
+      "42a572995a6997b5f61a54ae65abd0dc6b59626d",
       []
      ],
      "tests2dtext.yaml": [
@@ -282828,7 +282862,7 @@
       []
      ],
      "percentage-heights-004-ref.html": [
-      "ffb44a82b5338a605c9c0395e478627d00014d36",
+      "7c1e5858130b6150d36c52df0eaa525836b9075a",
       []
      ],
      "percentage-widths-001-ref.html": [
@@ -297906,6 +297940,10 @@
        "2861918d87f3cebaa3fe0d4978668e970424d84e",
        []
       ],
+      "text-decoration-skip-ink-005-notref.html": [
+       "9cbee037c0ec7c25b5bfa9813e96652750481c52",
+       []
+      ],
       "text-decoration-skip-ink-sidewayslr-001-notref.html": [
        "49cbf1530d7c9447f125c7ceea34b81a96de2f4a",
        []
@@ -305718,7 +305756,7 @@
         ]
        },
        "check-for-references.sh": [
-        "f5f68d5f57849e625442d4bce3138136615a0330",
+        "adcc7dd2e7dca8a2c820dcf8e1844667a7333b0b",
         []
        ],
        "color4": {
@@ -305953,7 +305991,7 @@
          []
         ],
         "reftest.list": [
-         "3dde877e231363e1642e876a62141d45b24ce2d9",
+         "1c5b5447c7049a61174659944e7ab283f189b164",
          []
         ]
        },
@@ -307559,7 +307597,7 @@
          ]
         },
         "reftest.list": [
-         "867a23079d7ce12289e74914c677344fb8332568",
+         "35102af64b63f93534d41ec1c8dbc4ad25ce6156",
          []
         ]
        },
@@ -308090,7 +308128,7 @@
         []
        ],
        "sync-tests.sh": [
-        "431ead2482e2ce46ac4ecc7d2ea454b11f8083f6",
+        "7e3f087681e99002f3532950716b7ef414e6ddfb",
         []
        ],
        "text-decor-3": {
@@ -309276,7 +309314,7 @@
       []
      ],
      "testharness-api.md": [
-      "d83ebc4e67669303945741d8933acc5ed4bd29d0",
+      "2ee52786add43f036fe0ac7c8b66acc892d876ff",
       []
      ],
      "testharness-tutorial.md": [
@@ -309646,7 +309684,7 @@
       []
      ],
      "Element-matches.js": [
-      "9494f6f0eacb1b9604d3781b6e541bf7a47e6071",
+      "a1455c671f7a372f239ca7843bd50b9652d59b73",
       []
      ],
      "Node-isEqualNode-iframe1.xml": [
@@ -309670,7 +309708,7 @@
       []
      ],
      "ParentNode-querySelector-All.js": [
-      "3d424f750b9700a23261bc84547c11e28f4b1fea",
+      "3c6c50317988712fa64d26da8d31d4f91c498f2c",
       []
      ],
      "attributes.js": [
@@ -313546,8 +313584,8 @@
      "5a5d7f980f4d1ea51b03c4ce26442f64956df517",
      []
     ],
-    "forced-colors-mode-18.tentative-ref.html": [
-     "34eba583caa924d5aa9a6d0271acbc29c1b25a4b",
+    "forced-colors-mode-18-ref.html": [
+     "a1701e3fdac842ea26c8f291b23f1febdb305d11",
      []
     ],
     "forced-colors-mode-19-ref.html": [
@@ -313562,8 +313600,8 @@
      "9c626ae768676c155459e90a75e2bd4fdda02867",
      []
     ],
-    "forced-colors-mode-26.tentative-ref.html": [
-     "f551a434290652dbb1e9bb003dec8bcbb34562d3",
+    "forced-colors-mode-26-ref.html": [
+     "39caee40b52aca059a9a65ffde754788228ff9dc",
      []
     ],
     "resources": {
@@ -313907,6 +313945,10 @@
         "26b28a0d7dcb912dc1f1131b98993bb29d3a18c1",
         []
        ],
+       "form.html": [
+        "6523a82b3930912f175115d2a82d8fd4ed016152",
+        []
+       ],
        "href.html": [
         "eccadadf41a873d9b50f643dcdc5fd83336f1605",
         []
@@ -315136,6 +315178,14 @@
        "1008f70ff123ae5e507a95ac4f16d32bbb74c983",
        []
       ],
+      "navigate-require-corp-same-site.sub.html": [
+       "9a0ebe544a0e5f09ba3f1b0790e052e96d81a6fc",
+       []
+      ],
+      "navigate-require-corp-same-site.sub.html.headers": [
+       "56d0ac342824434c621fb50f9351e2e74aa077cb",
+       []
+      ],
       "navigate-require-corp.sub.html": [
        "d4b38bc1a10003f8adc0e62224c5d3378638fb4f",
        []
@@ -319375,6 +319425,10 @@
        ]
       },
       "shared-array-buffers": {
+       "blob-data.https.html.headers": [
+        "63b60e490f47f4db77d33d7a4ca2f5b9a4181de8",
+        []
+       ],
        "broadcastchannel-success-and-failure.https.html.headers": [
         "63b60e490f47f4db77d33d7a4ca2f5b9a4181de8",
         []
@@ -324549,7 +324603,7 @@
      []
     ],
     "css-font-loading.idl": [
-     "2bbc35a25912256fb1d56ada3372d35e59ca69e5",
+     "936ded788bcbbf38b71be5d58e886059245b6b89",
      []
     ],
     "css-fonts.idl": [
@@ -324593,7 +324647,7 @@
      []
     ],
     "cssom-view.idl": [
-     "2745ba96dc04a66501c2e5f7ffb0846a700f097d",
+     "82517fefcc218ce1abb41169d45e6aefc580ca6d",
      []
     ],
     "cssom.idl": [
@@ -324853,7 +324907,7 @@
      []
     ],
     "resize-observer.idl": [
-     "d53e9da55ee33faef05aeb10e50ba31f27cf88c8",
+     "448c949df9e38d90b96171a15ec0a4705e486395",
      []
     ],
     "resource-timing.idl": [
@@ -324869,7 +324923,7 @@
      []
     ],
     "scroll-animations.idl": [
-     "865419c15b58c0c4ff113d0a8651f3c8eae82a2c",
+     "a247308e50e4275d047f65c01adbe04e6fd1fe3f",
      []
     ],
     "secure-contexts.idl": [
@@ -324933,7 +324987,7 @@
      []
     ],
     "visual-viewport.idl": [
-     "8e9316bf854fb80c2dc79cad72d90cdde6d95c46",
+     "5e4b54136940d4341d97e73383144e3b79477b7e",
      []
     ],
     "wai-aria.idl": [
@@ -324957,7 +325011,7 @@
      []
     ],
     "web-bluetooth.idl": [
-     "65c4e20ef341d8ba9ac28d85e1d34057935ce6cf",
+     "cbf09e1d7ed736f27f2c2a0ee185da681e1ffed6",
      []
     ],
     "web-locks.idl": [
@@ -324973,7 +325027,7 @@
      []
     ],
     "webaudio.idl": [
-     "9491090337c342fc06a35a97ee6dc6887829c1bc",
+     "f0a5c7a9020b1eaa0af6df3664c41ecd03f71082",
      []
     ],
     "webauthn.idl": [
@@ -325250,7 +325304,7 @@
     ]
    },
    "lint.whitelist": [
-    "a79d77f2fedfc5a63a8b4c24b31687d50f7c9dc7",
+    "6ea2bd4ec1e2dcc8ee77d962b723104b7ee02b0f",
     []
    ],
    "loading": {
@@ -337216,10 +337270,6 @@
      "fd46101ca0099e76a8ed5723515f6e1bd220aebb",
      []
     ],
-    "LICENSE": [
-     "45896e6be2bd51f4b78e9703caefb9b672e10a55",
-     []
-    ],
     "META.yml": [
      "64a240ccbe8116a06ec40fd03140e6bbee7a260f",
      []
@@ -337398,7 +337448,7 @@
       []
      ],
      "webxr-test.js": [
-      "be8be8067e94bfb0b43d258d450d6637b12f645d",
+      "dee05d08ff8a87e25e30be8ca53105fcc8667db1",
       []
      ],
      "webxr-test.js.headers": [
@@ -337407,7 +337457,7 @@
      ]
     },
     "idlharness.js": [
-     "18b11ec506da18d40546928f78aa4f911eb03dcf",
+     "ff40847a1fc8d4c8393e03ce34e0643522e182a3",
      []
     ],
     "idlharness.js.headers": [
@@ -337490,7 +337540,7 @@
         []
        ],
        "api-tests-1.html": [
-        "05b570a6d0ae101729292b7ceaf21933b6a75f80",
+        "7c77afdda8e37ee429ed272e24461af6cd68429a",
         []
        ],
        "api-tests-2.html": [
@@ -337737,6 +337787,10 @@
         "is_to_json_regular_operation.html": [
          "abfa4ab800b3c8e6b5f6fd3b42a982cc2e4fe99e",
          []
+        ],
+        "toString.html": [
+         "779c7a15e6d7b9ec20c38ba24900f752096df3e2",
+         []
         ]
        },
        "assert_object_equals.html": [
@@ -337823,7 +337877,7 @@
      []
     ],
     "testharness.js": [
-     "7a0e4872899aa5f4961c946cdc0cf2b187542cce",
+     "0ec232c1d27d792b1dc000a9cf7899e011217698",
      []
     ],
     "testharness.js.headers": [
@@ -337903,7 +337957,7 @@
      []
     ],
     "scroll-to-text-fragment-target.html": [
-     "b06f3c889c19c65a5a0d7b419d6d31429838bf5a",
+     "b2be85132cb8f2f2c14c82bf1854c3130f375c96",
      []
     ],
     "stash.js": [
@@ -339336,6 +339390,10 @@
        "dc3f1a1e98563ad1b5924c8315c0d64d17ffbbfd",
        []
       ],
+      "fetch-event-handled-worker.js": [
+       "4af58e20d05c902d74511579e6b74894731d1239",
+       []
+      ],
       "fetch-event-network-error-controllee-iframe.html": [
        "f6c1919bbcf63a0f23f7ea4f0f8baa0e5bae4035",
        []
@@ -340343,10 +340401,6 @@
      ]
     },
     "untriaged": {
-     "LICENSE": [
-      "531fac43af201b503c333f845587f0cca88c9c5f",
-      []
-     ],
      "README": [
       "5b7572bda4e2c2b2477a151345de3441265a8ca8",
       []
@@ -342329,7 +342383,7 @@
      }
     },
     "localpaths.py": [
-     "f6e24b486d58b788b9441175c5e1c89f93874feb",
+     "ce3b41e300c9f11380ea065f5b288d5aef812588",
      []
     ],
     "manifest": {
@@ -342434,408 +342488,6 @@
      "6bdb4d563f6dd5086ed3e09715187e549edf255a",
      []
     ],
-    "pywebsocket": {
-     "CONTRIBUTING": [
-      "6415f5d011f3e22be554ff755c078052213afa90",
-      []
-     ],
-     "LICENSE": [
-      "989d02e4cd09237806f7df8beaecc6915273428e",
-      []
-     ],
-     "MANIFEST.in": [
-      "19256882c56feb72812c99c8a8379979e63e4a0c",
-      []
-     ],
-     "README": [
-      "c8c758f5eef4c731892641de333e5d75d10a3e56",
-      []
-     ],
-     "README.md": [
-      "ae8e910a84ef995669ea0723f1bc7f2993466589",
-      []
-     ],
-     "example": {
-      "abort_handshake_wsh.py": [
-       "008023a1fe91e2f2977b163f977dae6850009aa4",
-       []
-      ],
-      "abort_wsh.py": [
-       "2bbf005f6a37c609e16abde4df94024268d0daee",
-       []
-      ],
-      "arraybuffer_benchmark.html": [
-       "869cd7e1ee653d59f04b802ff34c8d081317ca89",
-       []
-      ],
-      "bench_wsh.py": [
-       "5067ca7d8955fc163d5001cd8812e6ae20c16293",
-       []
-      ],
-      "benchmark.html": [
-       "a923863a99569763ab7976a7de78205ca6192a2a",
-       []
-      ],
-      "benchmark.js": [
-       "856435d1d0dd78d9794aa84c029c8ab4f7339ec1",
-       []
-      ],
-      "benchmark_helper_wsh.py": [
-       "44ad0bfeefc6f4430571b7b53233fb7950614cf2",
-       []
-      ],
-      "close_wsh.py": [
-       "26b0838408124539797657d40d64278f1a6481c0",
-       []
-      ],
-      "console.html": [
-       "ccd6d8f80676b9991e22dfc7ec85083411ddd0b3",
-       []
-      ],
-      "cookie_wsh.py": [
-       "8b327152e701f7d2031d7c9ce04624cfa84ac16d",
-       []
-      ],
-      "echo_client.py": [
-       "8ac740e7058bd31a78bcf1b1b897d3bdf3fc7d4b",
-       []
-      ],
-      "echo_noext_wsh.py": [
-       "1df5151227111e114424c5586a142a9adb7d604d",
-       []
-      ],
-      "echo_wsh.py": [
-       "38646c32ceb515f15dd572622689c79ee61e543f",
-       []
-      ],
-      "eventsource.cgi": [
-       "adddf237cf7d476497347d095a122994177e1409",
-       []
-      ],
-      "eventsource.html": [
-       "1598a8807d1ffccecf585f1bb656fd2d902fcd39",
-       []
-      ],
-      "fetch_benchmark.html": [
-       "2105eb67a5532b76bc97bf83108a19e043e54f31",
-       []
-      ],
-      "fetch_benchmark.js": [
-       "13952190a8e0739e3a0f2a48cb83dbe9b3015396",
-       []
-      ],
-      "fetch_performance_test_iframe.html": [
-       "e12df2e7df4d3ea62dc2a0bd5e81be8bf5b5dbc9",
-       []
-      ],
-      "handler_map.txt": [
-       "21c4c09aa0091d8baf2908959905867842aeb865",
-       []
-      ],
-      "hsts_wsh.py": [
-       "e861946921af04594d62026b46f07758ddfe402a",
-       []
-      ],
-      "internal_error_wsh.py": [
-       "fe581b54a648c09a22f2545127d70df051349234",
-       []
-      ],
-      "origin_check_wsh.py": [
-       "e05767ab932fb582824aaf1a57d9249c304bd51e",
-       []
-      ],
-      "performance_test_iframe.html": [
-       "78aede97a143042854e555728937228feac7beb0",
-       []
-      ],
-      "performance_test_iframe.js": [
-       "065b25bd1ffd637593ef3f7f06f0a4fe660ad0e8",
-       []
-      ],
-      "pywebsocket.conf": [
-       "335d130a5c84f69de4f81d358fb2cdb5bde4af6d",
-       []
-      ],
-      "special_headers.cgi": [
-       "ea5080f1f1aea3a37a7e729c678d6a12337bedb7",
-       []
-      ],
-      "util.js": [
-       "9ec0007b1edd5a0c5717a28da0552187a67da9a7",
-       []
-      ],
-      "util_main.js": [
-       "471ed63fb5d749d0ed2181b5aabcce2e9365b87e",
-       []
-      ],
-      "util_worker.js": [
-       "98dcf4417299f9c9d61deefcb1a595aeab05d56c",
-       []
-      ],
-      "xhr_benchmark.html": [
-       "800d20c9ccb4abecf239c75b18577b0d1ff11c92",
-       []
-      ],
-      "xhr_benchmark.js": [
-       "14a97e8fb83e948c85f9f021021dc7479305e6c0",
-       []
-      ],
-      "xhr_event_logger.html": [
-       "50db0fbec49465091329bdaf4717d7219886ad6f",
-       []
-      ],
-      "xhr_performance_test_iframe.html": [
-       "ab02c9ea56f6c10d03bec1038d6722de6e8d31e5",
-       []
-      ]
-     },
-     "mod_pywebsocket": {
-      "__init__.py": [
-       "70933a220451fadb6a01a5c1d45c2551468d7d85",
-       []
-      ],
-      "_stream_base.py": [
-       "21a1254ae6d0e36fb5e97981283c57b15df6f3eb",
-       []
-      ],
-      "_stream_hixie75.py": [
-       "94cf5b31ba0fc3c3a3477de82297a0c26da1c48c",
-       []
-      ],
-      "_stream_hybi.py": [
-       "718e8ffa3955d5af5c3b7c516bcfa980efe6dd88",
-       []
-      ],
-      "common.py": [
-       "9f73d66560d644155ee0f5f2a550988987130d9b",
-       []
-      ],
-      "dispatch.py": [
-       "2591fe8b9e9eaf2e8eb4d6d8bcfcba72e030bb41",
-       []
-      ],
-      "extensions.py": [
-       "d1be749fff59896517fc51571746c7f1c2a7eb09",
-       []
-      ],
-      "fast_masking.i": [
-       "ddaad27f53c46be2a71c704c708fbb3f42f1a3d1",
-       []
-      ],
-      "handshake": {
-       "__init__.py": [
-        "707263a69fe95156b5f3b39d5883db975259d34c",
-        []
-       ],
-       "_base.py": [
-        "0af05242bfcd6fc96cbd8839b070384424a7e29f",
-        []
-       ],
-       "hybi.py": [
-        "2dbf25a1dcca77cd589dba7054f4e6272c6dea22",
-        []
-       ],
-       "hybi00.py": [
-        "8757717a639bac3db05d4cb3027e055fdbf7f3cf",
-        []
-       ]
-      },
-      "headerparserhandler.py": [
-       "06e7638597985a96a4c00ea0052a0d3717e4403c",
-       []
-      ],
-      "http_header_util.py": [
-       "8e0584c5dac8cc44c776f7ccb4e6a5040ce52224",
-       []
-      ],
-      "memorizingfile.py": [
-       "c7afcc157ed7a1d942cbf4358afa0454846f01d4",
-       []
-      ],
-      "msgutil.py": [
-       "fc6c5b1dbce97d72f26cb77cdb7f846741b1bb3c",
-       []
-      ],
-      "mux.py": [
-       "994f8a14645c54b674b81458367319b66030447d",
-       []
-      ],
-      "standalone.py": [
-       "2c8786064889e84f115a75679ab71c74466a0c62",
-       []
-      ],
-      "stream.py": [
-       "a7d3136ac9b42f5df5652d91f3c886f85ecbf1f4",
-       []
-      ],
-      "util.py": [
-       "6c8284cd0744cde384c542a96dcc30aef5ade874",
-       []
-      ],
-      "xhr_benchmark_handler.py": [
-       "43a5b049220ee790efea51bda6a3f95d8dcf0975",
-       []
-      ]
-     },
-     "setup.py": [
-      "935d6b105899ca1348d7d6d68bbe2bd49e85d118",
-      []
-     ],
-     "test": {
-      "__init__.py": [
-       "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
-       []
-      ],
-      "cert": {
-       "cacert.pem": [
-        "4dadae121bdd3adb744383cd3bf08c226f8554ba",
-        []
-       ],
-       "cert.pem": [
-        "25379a72b0dac5f41979c802c663df8b88dea829",
-        []
-       ],
-       "client_cert.p12": [
-        "14e139927982fa9823a57231af113499d6a5a8b0",
-        []
-       ],
-       "key.pem": [
-        "fae858318f29ba6b4623bd5fbc4a08ce73d90311",
-        []
-       ]
-      },
-      "client_for_testing.py": [
-       "18d185712eea408a23d24fbcce1aaf493a5aa7e3",
-       []
-      ],
-      "endtoend_with_external_server.py": [
-       "47f86fdb4163d4e738952b3ccb77f19216bc5915",
-       []
-      ],
-      "mock.py": [
-       "6bffcac48dc43a52b9ccf1bcd012975424048d67",
-       []
-      ],
-      "mux_client_for_testing.py": [
-       "304e7fc95d3fc5b3ee2d9e54f20782addae2040f",
-       []
-      ],
-      "run_all.py": [
-       "80a5d87d83822b0783be13e33dda3ab61a5afe40",
-       []
-      ],
-      "set_sys_path.py": [
-       "e3c6db9ea4d383a37c27a060a0ef1c563bbb1e14",
-       []
-      ],
-      "test_dispatch.py": [
-       "e16d605609c8ab7b30d72063830ff434c1c56dc0",
-       []
-      ],
-      "test_endtoend.py": [
-       "3680ec2eba6724a74905be4f1581f36a7a7f7713",
-       []
-      ],
-      "test_extensions.py": [
-       "94a4384792bffd0a20d2e75433dc2909cf93de6d",
-       []
-      ],
-      "test_handshake.py": [
-       "aa78ac05e5871d159a67f7e416f302700fa0f926",
-       []
-      ],
-      "test_handshake_hybi.py": [
-       "d0aaf640a588e2b042f32a9c66a3697ad4dd10be",
-       []
-      ],
-      "test_handshake_hybi00.py": [
-       "73f9f27ca2d9421b23015f58c893acf1dc009def",
-       []
-      ],
-      "test_http_header_util.py": [
-       "436dc57c3731071fe2901919e33f24c1b559f605",
-       []
-      ],
-      "test_memorizingfile.py": [
-       "8f1b8eef43378a9b00625f220c97fe22f740a8f7",
-       []
-      ],
-      "test_mock.py": [
-       "7dc23a73d8fb1a07aeb3e5ae9402cc86b8fcc366",
-       []
-      ],
-      "test_msgutil.py": [
-       "234735c63047d2edb238cb5255ad474a2e4d0a83",
-       []
-      ],
-      "test_mux.py": [
-       "0773decbfd66d0dffef0b4287bad87453fc1d644",
-       []
-      ],
-      "test_stream.py": [
-       "81acfeb048d3b2032a7948cfa2adea7ce64f95ae",
-       []
-      ],
-      "test_stream_hixie75.py": [
-       "ca9ac7130b7304eb92dbbbc1533aa41545e0246d",
-       []
-      ],
-      "test_util.py": [
-       "64ba3f47737a331ef0390cc6b0c81c2d34a42833",
-       []
-      ],
-      "testdata": {
-       "README": [
-        "c001aa5595cdd13407f5728ecd532a5d12263efa",
-        []
-       ],
-       "handlers": {
-        "abort_by_user_wsh.py": [
-         "367f9930f7824c3a535914a5b3779f6b6fba243f",
-         []
-        ],
-        "blank_wsh.py": [
-         "7f87c6af23df08efe3575cae208de5022cbaa660",
-         []
-        ],
-        "origin_check_wsh.py": [
-         "2c139fa176cc3417be96de798e6a81ed149b1992",
-         []
-        ],
-        "sub": {
-         "exception_in_transfer_wsh.py": [
-          "b982d0231ef00f02e0d90df678eb804ba43862d9",
-          []
-         ],
-         "no_wsh_at_the_end.py": [
-          "17e7be1802e3c66c63849875ea35e2406a381e60",
-          []
-         ],
-         "non_callable_wsh.py": [
-          "26352eb4ca238952239e3542728ce3b38d83dd6b",
-          []
-         ],
-         "plain_wsh.py": [
-          "db3ff6930256bc1b13e2c4c2d1c843c4b7c80aa4",
-          []
-         ],
-         "wrong_handshake_sig_wsh.py": [
-          "6bf659bc9af01c107ef3508b2b5d0173dcf59009",
-          []
-         ],
-         "wrong_transfer_sig_wsh.py": [
-          "e0e2e550794b7b990e0b44b33cfc2d4d152e6c04",
-          []
-         ]
-        }
-       },
-       "hello.pl": [
-        "882ef5a10065feb691af5f716b1e4996b397da65",
-        []
-       ]
-      }
-     }
-    },
     "requirements_flake8.txt": [
      "0a45224016417cddbf59209196380cce0a089edf",
      []
@@ -342934,7 +342586,7 @@
       []
      ],
      "serve.py": [
-      "055b60f1e768c9e397f6cd086d41f1b8927c948a",
+      "f63bdcca5b00520334d99334a74e748544fc45e1",
       []
      ],
      "test_functional.py": [
@@ -347005,6 +346657,336 @@
        []
       ]
      },
+     "pywebsocket3": {
+      ".travis.yml": [
+       "2065a644dd6b60797128b09998f67b5135b1189e",
+       []
+      ],
+      "CONTRIBUTING": [
+       "f975be126fb4589c865994c59d613e3d41a7a966",
+       []
+      ],
+      "LICENSE": [
+       "c91bea9025428779e164459c2a120e1a07aa85c8",
+       []
+      ],
+      "MANIFEST.in": [
+       "19256882c56feb72812c99c8a8379979e63e4a0c",
+       []
+      ],
+      "README.md": [
+       "277cbe550c065782b0e315de04651c9e068cb3ad",
+       []
+      ],
+      "example": {
+       "abort_handshake_wsh.py": [
+        "1b719ca89737105719c71c2a42eaff0d464478c7",
+        []
+       ],
+       "abort_wsh.py": [
+        "d4c240bf2c1cb0bd538ec37bf551c11256396b8c",
+        []
+       ],
+       "arraybuffer_benchmark.html": [
+        "869cd7e1ee653d59f04b802ff34c8d081317ca89",
+        []
+       ],
+       "bench_wsh.py": [
+        "2df50e77db276cca1de472059a074071b81a93cc",
+        []
+       ],
+       "benchmark.html": [
+        "f1e5c97b3a71bcf9ebde7c4fcaf15375389b1c69",
+        []
+       ],
+       "benchmark.js": [
+        "2701472a4faac446b1c8bd2456f271e934db571c",
+        []
+       ],
+       "benchmark_helper_wsh.py": [
+        "fc175333354cc9c88562cf6fc81ef32609372986",
+        []
+       ],
+       "close_wsh.py": [
+        "8f0005ffea9905d6c197c0f4dd593c06ff437d3a",
+        []
+       ],
+       "console.html": [
+        "ccd6d8f80676b9991e22dfc7ec85083411ddd0b3",
+        []
+       ],
+       "cookie_wsh.py": [
+        "815209694e3ff2320f5683ee0596ae34428b15eb",
+        []
+       ],
+       "echo_client.py": [
+        "e4459a19bc68c7879a174f572122382914e6f7dd",
+        []
+       ],
+       "echo_noext_wsh.py": [
+        "eba5032218d269958bf751bf608bbb52556c6f76",
+        []
+       ],
+       "echo_wsh.py": [
+        "f7b3c6c5311bbb99f334f3357d801a2f42056008",
+        []
+       ],
+       "handler_map.txt": [
+        "21c4c09aa0091d8baf2908959905867842aeb865",
+        []
+       ],
+       "hsts_wsh.py": [
+        "e861946921af04594d62026b46f07758ddfe402a",
+        []
+       ],
+       "internal_error_wsh.py": [
+        "04aa684283a603f5b33dda526301999b44792ddf",
+        []
+       ],
+       "origin_check_wsh.py": [
+        "e05767ab932fb582824aaf1a57d9249c304bd51e",
+        []
+       ],
+       "performance_test_iframe.html": [
+        "c18b2c08f6a2254a1f9d76507902c1a6b5aee88a",
+        []
+       ],
+       "performance_test_iframe.js": [
+        "270409aa6eb5fd1a11ae2d5ba156bb8aac2fcaac",
+        []
+       ],
+       "special_headers.cgi": [
+        "703cb7401b787ac6e11c6746c6842e57d380956c",
+        []
+       ],
+       "util.js": [
+        "990160cb40c4c7800cd9e76300140b9bfe9f14d0",
+        []
+       ],
+       "util_main.js": [
+        "78add48731f88fe85eeea40e6e019cf17ccce3c8",
+        []
+       ],
+       "util_worker.js": [
+        "dd90449a90a7d782b97023e8d9d5a7aaee94a32f",
+        []
+       ]
+      },
+      "mod_pywebsocket": {
+       "__init__.py": [
+        "28d5f5950f347531b9262c31b77d0c29d426e59d",
+        []
+       ],
+       "_stream_exceptions.py": [
+        "b47878bc4a379b5ad8c423a8e38df405a96ccbf5",
+        []
+       ],
+       "common.py": [
+        "9cb11f15cb2f582e6c29e698ee5fff2afde8a768",
+        []
+       ],
+       "dispatch.py": [
+        "4ee943a5b80afdc0bda953aa2a73198b99a459b0",
+        []
+       ],
+       "extensions.py": [
+        "344539f6fce14bee65d7fa7a583acbb65f023aff",
+        []
+       ],
+       "fast_masking.i": [
+        "ddaad27f53c46be2a71c704c708fbb3f42f1a3d1",
+        []
+       ],
+       "handshake": {
+        "__init__.py": [
+         "82be5ae9fdfd46d18970bf992cc1adea25acc5f7",
+         []
+        ],
+        "_base.py": [
+         "358dd8d497d9d89dd9c10432bcdba3e903e1b616",
+         []
+        ],
+        "hybi.py": [
+         "7fd63eb63edd1f4acf887df35d4bdc3b6e139915",
+         []
+        ]
+       },
+       "http_header_util.py": [
+        "ded90b247b8ded9f254daba70909cbc8ff3c82d6",
+        []
+       ],
+       "memorizingfile.py": [
+        "d35396761847a6840464840b0e72ebc7ba150e41",
+        []
+       ],
+       "msgutil.py": [
+        "f58ca78e14ad25e7a44d1ab262e7bd35ceaea5f2",
+        []
+       ],
+       "request_handler.py": [
+        "e038d9f43acd37bf5a1b10a0ce5585bd51ed602d",
+        []
+       ],
+       "server_util.py": [
+        "8f9e273e9770844b7cb44616ebf9825886bf44e6",
+        []
+       ],
+       "standalone.py": [
+        "1042c496c58a23b6ce4c23eee0ba462095452671",
+        []
+       ],
+       "stream.py": [
+        "fc399f2a85b9fe6c52ec5690f580d06b222e4748",
+        []
+       ],
+       "util.py": [
+        "e164e6b8e4682467187fc3894b1ca79ec82a413a",
+        []
+       ],
+       "websocket_server.py": [
+        "df8cd393c7ee8069675713665d85be7d97657b70",
+        []
+       ]
+      },
+      "setup.py": [
+       "57e9428d691d756cf3d687e756b73814ccd3be7d",
+       []
+      ],
+      "test": {
+       "__init__.py": [
+        "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
+        []
+       ],
+       "cert": {
+        "cacert.pem": [
+         "4dadae121bdd3adb744383cd3bf08c226f8554ba",
+         []
+        ],
+        "cert.pem": [
+         "25379a72b0dac5f41979c802c663df8b88dea829",
+         []
+        ],
+        "client_cert.p12": [
+         "14e139927982fa9823a57231af113499d6a5a8b0",
+         []
+        ],
+        "key.pem": [
+         "fae858318f29ba6b4623bd5fbc4a08ce73d90311",
+         []
+        ]
+       },
+       "client_for_testing.py": [
+        "450a6acd5376223c603abe264b967796832fb573",
+        []
+       ],
+       "mock.py": [
+        "eeaef52ecf0197f7e57f346a71548252a3861e67",
+        []
+       ],
+       "run_all.py": [
+        "f622015539e47fdf518875158f6bd6f36994faba",
+        []
+       ],
+       "set_sys_path.py": [
+        "9fce7b34b6751d635dcda6e0d4a5711951a0a33b",
+        []
+       ],
+       "test_dispatch.py": [
+        "ae63980f2581f9f6136e85dc16bb64ccbe373dc9",
+        []
+       ],
+       "test_endtoend.py": [
+        "445d29c67ddf07b3f123245977f95cfe0148c83a",
+        []
+       ],
+       "test_extensions.py": [
+        "39a111888be9005bd7b684366aebfd1d914f4a32",
+        []
+       ],
+       "test_handshake.py": [
+        "e0e2278dfe65019d7659489b538fcc85ad57d455",
+        []
+       ],
+       "test_handshake_hybi.py": [
+        "04841f1f79fa89f03f0e0219e06b213c34f5f0fc",
+        []
+       ],
+       "test_http_header_util.py": [
+        "5ce01ef283913e3fc8775b3b27311f6195c57be7",
+        []
+       ],
+       "test_memorizingfile.py": [
+        "f7288c510b89bb28931dff9a779183a4991756e6",
+        []
+       ],
+       "test_mock.py": [
+        "073873dde97df03f20df5ac9722f6ad65dd02eac",
+        []
+       ],
+       "test_msgutil.py": [
+        "943f21b8d297668770cb91c501c2b2fc8258b9eb",
+        []
+       ],
+       "test_stream.py": [
+        "153899d20533eb4cf0a9816c8b3b2bc8c50548bf",
+        []
+       ],
+       "test_util.py": [
+        "20347941051455ebee58823b4b0be93762912b0a",
+        []
+       ],
+       "testdata": {
+        "README": [
+         "c001aa5595cdd13407f5728ecd532a5d12263efa",
+         []
+        ],
+        "handlers": {
+         "abort_by_user_wsh.py": [
+          "63cb541bb7ec4044745798ab97ae7ccba57e04f7",
+          []
+         ],
+         "blank_wsh.py": [
+          "b398e96778d8f75c8d7424c27b40c1fad9918efc",
+          []
+         ],
+         "origin_check_wsh.py": [
+          "bf6442e65b99dd7d455cb09a0afc9d4958df041b",
+          []
+         ],
+         "sub": {
+          "exception_in_transfer_wsh.py": [
+           "54390994d712dfe8f1e4dfdd94ff56abe6673d8e",
+           []
+          ],
+          "no_wsh_at_the_end.py": [
+           "ebfddb74495eef1d1f351e334ac4850473ed1648",
+           []
+          ],
+          "non_callable_wsh.py": [
+           "8afcfa97a954a2be696c148dd1f553628f121ea6",
+           []
+          ],
+          "plain_wsh.py": [
+           "8a7db1e5ac326df51c68e3ed2690be2a03c873cb",
+           []
+          ],
+          "wrong_handshake_sig_wsh.py": [
+           "cebb0da1ab6b0bdd077b833281376c1a811550f2",
+           []
+          ],
+          "wrong_transfer_sig_wsh.py": [
+           "ad27d6bcfeeaf02a942a8b30b7d3340fb20d2330",
+           []
+          ]
+         }
+        },
+        "hello.pl": [
+         "882ef5a10065feb691af5f716b1e4996b397da65",
+         []
+        ]
+       }
+      }
+     },
      "six": {
       "CHANGES": [
        "ffa702601b6509b25fbd6787d1e7682e5ac39356",
@@ -347167,7 +347149,7 @@
        []
       ],
       "client.py": [
-       "cf4c5fd35fd98bb54ba248d1c1c31590310727ed",
+       "9885e99c4f7c8c339caad4fd2172e59688d9b2fe",
        []
       ],
       "error.py": [
@@ -347179,7 +347161,7 @@
        []
       ],
       "transport.py": [
-       "c33582db1a906e3f62c0c912fc29e55027dff2e4",
+       "edaf3186039d287dd5ef3ce6e4e616fd8bc0e302",
        []
       ]
      }
@@ -347289,10 +347271,6 @@
       "495616ef1d19c54cb963e99e1a226e8320cc3744",
       []
      ],
-     "LICENSE": [
-      "45896e6be2bd51f4b78e9703caefb9b672e10a55",
-      []
-     ],
      "MANIFEST.in": [
       "d36344f9668919f9dfc8f2e60a470a5d0484c292",
       []
@@ -347640,7 +347618,7 @@
         []
        ],
        "base.py": [
-        "e6b44f02641f94cc9591ea08d6d748ac3ebbec1c",
+        "cb7323ece0ae4a9af7213a0134e976ef325e3e13",
         []
        ],
        "executorchrome.py": [
@@ -347684,7 +347662,7 @@
         []
        ],
        "executorwebdriver.py": [
-        "da763074e2e58aa2d3c4724b864f08072f18af33",
+        "eccba8c4a127f7895baa85948dc21006d5910aa5",
         []
        ],
        "executorwebkit.py": [
@@ -347904,7 +347882,7 @@
         []
        ],
        "sync.py": [
-        "0d75a1232fc0cba9fbd6e8a3363adea0475dd436",
+        "0a41f706ebc3760729d9ba553076fe0d7e0b40b8",
         []
        ],
        "tree.py": [
@@ -348013,10 +347991,6 @@
       "8e87d388488bbc21c664209fecd2f3e030411b0e",
       []
      ],
-     "LICENSE": [
-      "45896e6be2bd51f4b78e9703caefb9b672e10a55",
-      []
-     ],
      "MANIFEST.in": [
       "4bf44835220d8d466be23757a194bdc92aaa5584",
       []
@@ -348262,7 +348236,7 @@
         []
        ],
        "test_response.py": [
-        "d8d64d54ccc78a3c6deba21b73428e71aeb1be60",
+        "6e947e478d9e14e33676cbd62bbbada2f118ec7f",
         []
        ],
        "test_server.py": [
@@ -349949,7 +349923,7 @@
      []
     ],
     "helpers.js": [
-     "bbbba464948c77d57bf3fbc19f31cd4579551229",
+     "bf28e69cccf9b9fe2ba6becbda30910bb50a140e",
      []
     ],
     "resources": {
@@ -351106,7 +351080,7 @@
       []
      ],
      "simple_handshake_wsh.py": [
-      "bd9bb9c45f5351418dc83fa3862d7128d1340c26",
+      "a612a1a833d93758175d0b9d2e4afa18e7ba2e91",
       []
      ],
      "sleep_10_v13_wsh.py": [
@@ -357788,6 +357762,27 @@
        {}
       ]
      ],
+     "2d.pattern.image.nonexistent-but-loading.html": [
+      "d3a219d7b2f7e46bb578eb1b048e5adeeeaef3bc",
+      [
+       null,
+       {}
+      ]
+     ],
+     "2d.pattern.image.nonexistent.html": [
+      "c6c33b5c5220451433bd6b3113c3e0e6ceb5bdef",
+      [
+       null,
+       {}
+      ]
+     ],
+     "2d.pattern.image.nosrc.html": [
+      "0c275f82ac7e66c3f85830872932a3e126954f2c",
+      [
+       null,
+       {}
+      ]
+     ],
      "2d.pattern.image.null.html": [
       "be7ee14ea14e4313545c4337ce8735257c5b2be6",
       [
@@ -357809,6 +357804,20 @@
        {}
       ]
      ],
+     "2d.pattern.image.zeroheight.html": [
+      "143eec9d2cfa26d971359b7dcfb99f561aac83da",
+      [
+       null,
+       {}
+      ]
+     ],
+     "2d.pattern.image.zerowidth.html": [
+      "66890cfe2e0aff6e0bb0d7a468f751123b284c11",
+      [
+       null,
+       {}
+      ]
+     ],
      "2d.pattern.modify.canvas1.html": [
       "bf1c51564860697f43e842bcde2f1ffcbc5d30bc",
       [
@@ -358012,6 +358021,27 @@
        {}
       ]
      ],
+     "2d.pattern.svgimage.nonexistent.html": [
+      "756c2094c96f9de1f2c5dcf9718485ddf9ef4d81",
+      [
+       null,
+       {}
+      ]
+     ],
+     "2d.pattern.svgimage.zeroheight.html": [
+      "2cb1374d2db7454d5c9c0539f4d74f417e1bc65c",
+      [
+       null,
+       {}
+      ]
+     ],
+     "2d.pattern.svgimage.zerowidth.html": [
+      "0b3f70ddf002f523ea80e0be0d22d0e3fe18e47c",
+      [
+       null,
+       {}
+      ]
+     ],
      "2d.strokeStyle.default.html": [
       "e30c3edf50f742cc5d09554a52d504144a62f395",
       [
@@ -376192,35 +376222,35 @@
    },
    "clipboard-apis": {
     "async-interfaces.https.html": [
-     "1c423e95b669a30a6af86db7a84d76a5a9c176b4",
+     "06b777fbe328a191fc9625fe85e4f05eb751ed52",
      [
       null,
       {}
      ]
     ],
     "async-navigator-clipboard-basics.https.html": [
-     "22358f16d9699cc3b3897eaa266132b82760726b",
+     "65759186a6c98ab25f35e18d4f9d9350caedb1a0",
      [
       null,
       {}
      ]
     ],
     "async-raw-write-read.tentative.https.html": [
-     "6cfa2dbcca79f57db3fa57aeaff33c688423ff87",
+     "a6889d61efc43ae266c13d22b13286ade24e05a1",
      [
       null,
       {}
      ]
     ],
     "clipboard-events-synthetic.html": [
-     "fa40d8c20038c5a9c2cc09fe7dcfb1568de58be2",
+     "878682975266a3154756361a4e5d87c47482e393",
      [
       null,
       {}
      ]
     ],
     "clipboard-item.https.html": [
-     "d9dcee76419cdb3a17ff3d64f58b3e7143bb3a48",
+     "afec778eb99e8605a4c5a1001a2576e1e246b27c",
      [
       null,
       {}
@@ -376228,7 +376258,7 @@
     ],
     "detached-iframe": {
      "clipboard-on-detached-iframe.https.html": [
-      "9b43b3695afae88675f9ca543ec37def3b62bc11",
+      "84fce80323624af9d1f431e85bc90e9d620174b0",
       [
        null,
        {}
@@ -378699,7 +378729,7 @@
     },
     "nonce-hiding": {
      "nonces.html": [
-      "e7bada96f94f8081d257529dbd1c7f63bf31f462",
+      "b023d060323d9d9f366ffdb53159a6f25ab24065",
       [
        null,
        {}
@@ -378713,21 +378743,21 @@
       ]
      ],
      "script-nonces-hidden.html": [
-      "b32635ff65817d739bc2b7ff003211bce166db14",
+      "d9718d904c24326b86bd2853dcdfebe11d644da5",
       [
        null,
        {}
       ]
      ],
      "svgscript-nonces-hidden-meta.sub.html": [
-      "0bdf2ab8f488b7c32acd95acaa2e0628add504b8",
+      "870fef316eae9ca2fc5ab1182f746cfa6487cb05",
       [
        null,
        {}
       ]
      ],
      "svgscript-nonces-hidden.html": [
-      "d6e9379d4710b13d7ea47ba3d0e3c5cb5721899c",
+      "a50c75b34ca59fe51b57b55aec95d1fcddb84350",
       [
        null,
        {}
@@ -398160,7 +398190,7 @@
       ]
      ],
      "text-decoration-skip-ink.html": [
-      "cd6f7a049c673e3dc92546f557e1813b20448128",
+      "2d6a5d3671f40e2389e916f204ad353402bca799",
       [
        null,
        {}
@@ -402306,7 +402336,7 @@
       ]
      ],
      "minmax-number-computed.html": [
-      "c72c276625466a193bf8829e3ddbb87d7a565dc0",
+      "9a6e6142ea85ede12d742ca49f5bddf03b2e56b0",
       [
        null,
        {}
@@ -403244,7 +403274,7 @@
       ]
      ],
      "CSSStyleSheet-constructable.html": [
-      "d196b3965a5db70ee32604bd3fee9205309d4b36",
+      "539075b47efc8599c3d9147f2e4b417783fb1df5",
       [
        null,
        {}
@@ -405575,7 +405605,7 @@
         ]
        ],
        "syntax.html": [
-        "0eda7374053fd5a5ce23c00998f5b4923a57c4bd",
+        "e62c13a03409636b770126c0768f0f90912aafc7",
         [
          null,
          {}
@@ -406207,7 +406237,7 @@
     ],
     "custom-element-registry": {
      "define.html": [
-      "61717b2e20035d5e1e4b722eadfc525118c39d0b",
+      "2aad1c18025af6f6322c0d7e6ce4c6089f1ac906",
       [
        null,
        {}
@@ -406789,7 +406819,7 @@
       ]
      ],
      "with-exceptions.html": [
-      "e7cdee789d4a50b25dfd8620aaa2a756686201d2",
+      "131348b1c41ab8698e4daaf1d27071994babb0a7",
       [
        null,
        {}
@@ -406813,14 +406843,14 @@
      ]
     },
     "throw-on-dynamic-markup-insertion-counter-construct.html": [
-     "853595040143df0f70173279c755dd64f102f10e",
+     "3e9254e2a50f0ca572b9e9aa1641a4dab5f22e50",
      [
       null,
       {}
      ]
     ],
     "throw-on-dynamic-markup-insertion-counter-reactions.html": [
-     "49335bf9b425f3da178cc20ae4860333f5de4468",
+     "e798d332e38b2e85703e7752486fe221376212db",
      [
       null,
       {}
@@ -407405,7 +407435,7 @@
      ],
      "scrolling": {
       "overscroll-deltas.html": [
-       "287987c3ee20d07a6d5d2387efc1c3a6209f82e7",
+       "091cfd0631b454babaeb8c32dd289468b6d509d3",
        [
         null,
         {
@@ -408019,14 +408049,14 @@
       ]
      ],
      "Document-createElement.html": [
-      "c0126b4f8a88d887cd9fa05618e1b7d441064641",
+      "93435ac82d60c07dbe88b4d0bb744cd2cfd20cc9",
       [
        null,
        {}
       ]
      ],
      "Document-createElementNS.html": [
-      "43cf800b4cced3ced2b09216c0d909f26412dfeb",
+      "5ad81043de0717f4957b205a51d13f8dc41f41aa",
       [
        null,
        {}
@@ -408712,7 +408742,7 @@
       ]
      ],
      "Node-removeChild.html": [
-      "a4581aadc9b2526001cb5a70282d5e1939c0e819",
+      "6158423359c925c48ba27568c034ec02809e59fb",
       [
        null,
        {}
@@ -408835,7 +408865,7 @@
       ]
      ],
      "aria-attribute-reflection.tentative.html": [
-      "0a3a66bdf435ebef64a282eaec8f7a471096daaf",
+      "d5f4adff59f4f9e06ed0c22851c3af3b78a6a1c7",
       [
        null,
        {}
@@ -409133,7 +409163,7 @@
       ]
      ],
      "Range-cloneContents.html": [
-      "73bce34572583b66098e6cdb7cd487ece8cb5481",
+      "6064151f62d44307a081e735f1d688c4cafae718",
       [
        null,
        {
@@ -409228,7 +409258,7 @@
       ]
      ],
      "Range-extractContents.html": [
-      "b43769ebc01044c2dd46499df74b91fa955090e3",
+      "88f8fa55f8652fc189b4205f83f0b413e4fb7503",
       [
        null,
        {
@@ -409237,7 +409267,7 @@
       ]
      ],
      "Range-insertNode.html": [
-      "aca3a23ff5d58b891f4e6bcf295026470a9e2960",
+      "04727dbc4d2855dce34c3a9356f161fdeb1e0a86",
       [
        null,
        {
@@ -409395,7 +409425,7 @@
       ]
      ],
      "Range-surroundContents.html": [
-      "c4ff0509f8f4da0d56c190bc911852a77dbc973d",
+      "c1ed30d0053f2157776b8c58b19ce82cafb5e74f",
       [
        null,
        {
@@ -423701,7 +423731,7 @@
        ]
       ],
       "serviceworker-intercepted.https.html": [
-       "05eadefa4c8227410275b289388c7184b021a8d1",
+       "603f29eac981c7abcacd72c153685bc181ee80c4",
        [
         null,
         {}
@@ -425030,6 +425060,27 @@
         }
        ]
       ],
+      "data-url-iframe.html": [
+       "217baa3c46b631cbfe7d872e1a98c87d147e2d86",
+       [
+        null,
+        {}
+       ]
+      ],
+      "data-url-shared-worker.html": [
+       "d69748ab261b90cdc52b511c47a5f32a01bd21f2",
+       [
+        null,
+        {}
+       ]
+      ],
+      "data-url-worker.html": [
+       "13113e62621ac815ab10448c1185ffd13d830d59",
+       [
+        null,
+        {}
+       ]
+      ],
       "sandboxed-iframe.html": [
        "feb9f1f2e5bd3e2a1d1937103ea13c2fdb32aea6",
        [
@@ -428166,6 +428217,27 @@
          {}
         ]
        ],
+       "anchor-fragment-form-submit-longfragment.html": [
+        "8c4c77014fc92be94b7f71dd0fb2bfc7ee9a8a8c",
+        [
+         null,
+         {}
+        ]
+       ],
+       "anchor-fragment-form-submit-withpath.html": [
+        "b891623a2f560fe5cfec844b2a377b05139258f9",
+        [
+         null,
+         {}
+        ]
+       ],
+       "anchor-fragment-form-submit.html": [
+        "57e44f180856d6f8aa2d57b45a20c140e99d71c0",
+        [
+         null,
+         {}
+        ]
+       ],
        "child_navigates_parent_location.html": [
         "9111232e26e7de672b9e4df4b47b1c408338ae1c",
         [
@@ -428702,14 +428774,14 @@
       },
       "the-history-interface": {
        "001.html": [
-        "da93e0dafc7a749a14408977cb38a3a334ea2feb",
+        "b4a5fd4bf4de7bff169409913e658af9bb81017b",
         [
          null,
          {}
         ]
        ],
        "002.html": [
-        "dba28b0471cbfa832051078583c15df92d3fe331",
+        "dcda248282f494c76ba175eb966137704fdf8010",
         [
          null,
          {}
@@ -429546,7 +429618,7 @@
         ]
        ],
        "document_domain_setter.html": [
-        "77f438c0166bcb570050800d3227bd7dcc691545",
+        "25395283411203ca9d15a00513cfd23425c32b58",
         [
          null,
          {}
@@ -430548,7 +430620,7 @@
       ]
      ],
      "none.https.html": [
-      "7f296e60441458a5f38dfd351d717845677ce30b",
+      "e603753084cf2c3c85b0187a7a8f66b3de8cf401",
       [
        null,
        {
@@ -430592,7 +430664,7 @@
       ]
      ],
      "require-corp.https.html": [
-      "69a81311c130d5538242db6be85089d242e06698",
+      "6f799b6e4086c1e73654b694174cacc496b2582d",
       [
        null,
        {
@@ -432116,6 +432188,13 @@
        ]
       ],
       "shared-array-buffers": {
+       "blob-data.https.html": [
+        "b35d8c2798a56c74277f82d8b5c50582592ca962",
+        [
+         null,
+         {}
+        ]
+       ],
        "broadcastchannel-success-and-failure.https.html": [
         "8902de49cfb10293ddb6246dc834268621e0dcad",
         [
@@ -433252,6 +433331,13 @@
          {}
         ]
        ],
+       "img-empty-alt-replaced.html": [
+        "3cc06d6c8538a4b1431c1de9d46ac4a1c706dbec",
+        [
+         null,
+         {}
+        ]
+       ],
        "img-no-alt-replaced.html": [
         "896c7363113ca8872208059bbac51f7616b05f3f",
         [
@@ -439122,6 +439208,15 @@
          {}
         ]
        ],
+       "maxlength-number.html": [
+        "1e1d9f694cf215ca162bd8cdeceb982db33ea512",
+        [
+         null,
+         {
+          "testdriver": true
+         }
+        ]
+       ],
        "maxlength.html": [
         "da5d18d00a95ce4ca4b7ea9861d3d4930e0d157d",
         [
@@ -445377,14 +445472,14 @@
         ]
        ],
        "bailout-exception-vs-return-origin.sub.window.js": [
-        "d60be3b8d6096aaee5770780b024c0e28114f2af",
+        "b20c3e3f31798efb2ee151ee752c0ce56dbb0b68",
         [
          "html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-exception-vs-return-origin.sub.window.html",
          {}
         ]
        ],
        "bailout-exception-vs-return-xml.window.js": [
-        "8b1a04fe83adfe911d04b10a45f24569421c57ec",
+        "45a67f925bc10f5d5dfd7bb744850f050dc45dcf",
         [
          "html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-exception-vs-return-xml.window.html",
          {}
@@ -445405,7 +445500,7 @@
         ]
        ],
        "bailout-side-effects-same-origin-domain.sub.window.js": [
-        "9adacb2a99f9b4d5167a863b2d2ab9a1480266af",
+        "f5edd7aed9c19cb884fb399441d714542a700e3b",
         [
          "html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-side-effects-same-origin-domain.sub.window.html",
          {
@@ -445437,7 +445532,7 @@
         ]
        ],
        "bailout-side-effects-xml.window.js": [
-        "bcc4266319a428e77dc5ba6ea7d75b6445c76113",
+        "bbfc015c68e95d5aa8526936adf9693bcacef973",
         [
          "html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-side-effects-xml.window.html",
          {
@@ -445570,7 +445665,7 @@
         ]
        ],
        "origin-check-in-document-open-same-origin-domain.sub.html": [
-        "83ce50d6c4d6d424b9231b2a0aa505a59f19d3fc",
+        "ba4ef3bae88b74951a039b421531f074297c0811",
         [
          null,
          {}
@@ -446696,7 +446791,7 @@
      ]
     ],
     "context-creation-offscreen.html": [
-     "05a920cd3e605ade63aa4d01171d9d3f5597ed72",
+     "66d4cce420a8ca550d71391692225887ddb5a4df",
      [
       null,
       {}
@@ -470542,6 +470637,31 @@
       }
      ]
     ],
+    "po-disconnect-removes-observed-types.any.js": [
+     "cac97bea0755c1182956fdf94c98ee78ca40b017",
+     [
+      "performance-timeline/po-disconnect-removes-observed-types.any.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "performanceobservers.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "performance-timeline/po-disconnect-removes-observed-types.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "performanceobservers.js"
+        ]
+       ]
+      }
+     ]
+    ],
     "po-disconnect.any.js": [
      "5f5fb5aa43ba46268f8c355fdc93c6f1829968b4",
      [
@@ -470642,6 +470762,31 @@
       }
      ]
     ],
+    "po-observe-repeated-type.any.js": [
+     "2bba396a6b69ebad56ad4f1b135cb8ad49d321b7",
+     [
+      "performance-timeline/po-observe-repeated-type.any.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "performanceobservers.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "performance-timeline/po-observe-repeated-type.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "performanceobservers.js"
+        ]
+       ]
+      }
+     ]
+    ],
     "po-observe-type.any.js": [
      "2c0719a8d146882ad317ff2418e89d4e77a2da18",
      [
@@ -471851,7 +471996,7 @@
    },
    "portals": {
     "about-blank-cannot-host.html": [
-     "59858c690dcbfafaa673371384271d8b2a3c1a7c",
+     "6a721c32e6807cbd615b3adbffd7422467375525",
      [
       null,
       {}
@@ -471868,7 +472013,7 @@
       ]
      ],
      "frame-src.sub.html": [
-      "34f1474d4b37f6a867b858a0bfc88e03db48153a",
+      "1b37fd4ac2148e10828112876bb8ad0aaa818075",
       [
        null,
        {}
@@ -471884,7 +472029,7 @@
       ]
      ],
      "history-manipulation-inside-portal.html": [
-      "d19e153e51cabedecd4e86ce457dd714e7eac82e",
+      "efbf1de136cca726701fc1827dd0a00fda93c987",
       [
        null,
        {}
@@ -471892,14 +472037,14 @@
      ]
     },
     "htmlportalelement-event-handler-content-attributes.html": [
-     "8fc26386cfc9d30e89062440b9347c62b60aa592",
+     "04b4615205ae9f036231370b9d30aa217608f2c4",
      [
       null,
       {}
      ]
     ],
     "portal-activate-data.html": [
-     "9a712c914950eaa69d469c4218af8629f8ebe87a",
+     "cefb0eae3dc9a8b10880687fc084d44991f8f26f",
      [
       null,
       {}
@@ -471913,70 +472058,70 @@
      ]
     ],
     "portal-activate-event.html": [
-     "780e8b58af98cc910e3739e3a9a2e5567d5613d0",
+     "990dc2d4b85ac3ca49e246ba17249a2986592e4d",
      [
       null,
       {}
      ]
     ],
     "portal-non-http-navigation.html": [
-     "3b79df3c230e1128574d4a6eb81d407cd9303e2c",
+     "e2b5d3d3937e4991d99caa3d87901ffe6202a100",
      [
       null,
       {}
      ]
     ],
     "portal-onload-event.html": [
-     "c9f07fcc889043cd523206728f7daaaefa653409",
+     "da770013e26506cca3a314e39f6deb962e42578f",
      [
       null,
       {}
      ]
     ],
     "portals-activate-empty-browsing-context.html": [
-     "4beff610ea0d3da3d4d9133ceaa570f879e0c03b",
+     "d904cd58543ff02c280d3f43267b8d54cad7882b",
      [
       null,
       {}
      ]
     ],
     "portals-activate-inside-iframe.html": [
-     "4fbe9ba333b4e81e62a1b918c914d45617daf70d",
+     "5234babfdf9528c5b9d7861ba90ffe6ceebaccce",
      [
       null,
       {}
      ]
     ],
     "portals-activate-inside-portal.html": [
-     "efeb23d4e38d21627be812fa85bbd5d74ba83da4",
+     "bd0d9e27bb6b25adbc3844adc8f8f947cf83dce1",
      [
       null,
       {}
      ]
     ],
     "portals-activate-no-browsing-context.html": [
-     "cf5cb35da2fd7b9e5d6561fb58a63495de82f1c5",
+     "bfc45f68c1859401b015d9cd22aaf50cdefb1770",
      [
       null,
       {}
      ]
     ],
     "portals-activate-resolution.html": [
-     "db77a990e532a3d1b88f57300094cbd60215d69d",
+     "ada8d4619a075df9c8c422c5d8ff54a0f9700deb",
      [
       null,
       {}
      ]
     ],
     "portals-activate-twice.html": [
-     "731a342c7f58101cabd82f9a8f71e739ac31d217",
+     "eaef8b7cc94e0e62bc34e32d4c48c7b6bcb9f83d",
      [
       null,
       {}
      ]
     ],
     "portals-adopt-predecessor.html": [
-     "96d0be9a401771759c0d0cc5a9785497f9bf3447",
+     "21893987e63839bbfb8a9d67e0f41e7502c88812",
      [
       null,
       {}
@@ -471990,14 +472135,14 @@
      ]
     ],
     "portals-cross-origin-load.sub.html": [
-     "e19a225de046ba01a1232fb0cb456b6a706f583a",
+     "be817b8a0aa44de1773f7c9448a572a15bec9866",
      [
       null,
       {}
      ]
     ],
     "portals-focus.sub.html": [
-     "97b7579eb63694310aa4d34b656c7414e68bd7c2",
+     "54fcf3a3d4734f0a1a1f49462afbeba21a5a0644",
      [
       null,
       {
@@ -472007,14 +472152,14 @@
      ]
     ],
     "portals-host-exposure.sub.html": [
-     "36fc2b48c8d87e10a1cb533e19372de1a9251825",
+     "3ff88413691db6c64b1cdb7a23fe2191640d47c2",
      [
       null,
       {}
      ]
     ],
     "portals-host-hidden-after-activation.html": [
-     "f51e54bd49c5c1a422dab6f249fc3ee1da87eb0d",
+     "571ec55810aa8e76c3dd977f774b3a1eeb835904",
      [
       null,
       {}
@@ -472028,7 +472173,7 @@
      ]
     ],
     "portals-host-post-message.sub.html": [
-     "5331da0d7c3f0887bc161b7c8bc53ffcf3f1ebda",
+     "8750dd43d011ccf48d40f9671bd02c8dd29047c1",
      [
       null,
       {
@@ -472037,21 +472182,21 @@
      ]
     ],
     "portals-navigate-after-adoption.html": [
-     "5ad30d7928a6c4eda0cbcb5afad9c29234b9a057",
+     "f403902031303f21b9019c159d63b39ba1ff00d1",
      [
       null,
       {}
      ]
     ],
     "portals-nested.html": [
-     "9d8d09be9b104b7fa0c58f58c5b19d641db6c0eb",
+     "41d053bd48d11a9511168bf570e2d9d08bd78fdb",
      [
       null,
       {}
      ]
     ],
     "portals-post-message.sub.html": [
-     "5eee95cce654b30ce8401026d314b320f6cb4e45",
+     "f3927a0c05ace4e9e811548d49f6e0114560abf6",
      [
       null,
       {
@@ -472061,42 +472206,42 @@
      ]
     ],
     "portals-referrer-inherit-header.html": [
-     "0207474f37dea658ed9edb4352bd4e0719465558",
+     "da908cb2c21ff0c7996d36b326f18f400ad8b6be",
      [
       null,
       {}
      ]
     ],
     "portals-referrer-inherit-meta.html": [
-     "cf0493fb6224233396f6169b59641c866096a82d",
+     "eecb247973e838c6fc5e09f32180fe58c81a2727",
      [
       null,
       {}
      ]
     ],
     "portals-referrer.html": [
-     "cb08f56def7dfecaf3f5ed83cd668ed7f3ab663a",
+     "b9abcdb80de70dd5ed8135617945d59bdbb35269",
      [
       null,
       {}
      ]
     ],
     "portals-repeated-activate.html": [
-     "a3843dddb47b55d920b249b01f47199b1202bda6",
+     "bf8d8ad42641c4d775db4255087383007df07698",
      [
       null,
       {}
      ]
     ],
     "portals-set-src-after-activate.html": [
-     "70a16436a67f254372be5f861d83d9e9b66f895f",
+     "f9728170858792aae99aebeffe507bc5c94b0e19",
      [
       null,
       {}
      ]
     ],
     "predecessor-fires-unload.html": [
-     "381221222b59c0346dae48cc83d4985d155610c9",
+     "dce2afb8e6fde03c292456a7e960b52b8558c8ca",
      [
       null,
       {}
@@ -472104,7 +472249,7 @@
     ],
     "xfo": {
      "portals-xfo-deny.sub.html": [
-      "13c3f7f4d1fcdde9d2a744955bce6308805f1618",
+      "dde09c6e72bf9d2f0632aecbf6f8ca1cd0006436",
       [
        null,
        {
@@ -523047,7 +523192,7 @@
      ]
     ],
     "observe.html": [
-     "3b336837b3bbea08f21d5d5c9534dd638f29a24b",
+     "1ab5f786877cb6aa6ae85dd566db0f4e38f1c330",
      [
       null,
       {}
@@ -523854,7 +523999,7 @@
      ]
     ],
     "scroll-animation.html": [
-     "7a6f87574403a03703e0f4fd148667a0d573218d",
+     "62e5bb854aa2cc7d564c258f58e05342ffb8b446",
      [
       null,
       {}
@@ -523904,7 +524049,7 @@
      ]
     ],
     "scroll-to-text-fragment.html": [
-     "f0b167a9051aa5a8bc03f5df55020a1c7a3d726d",
+     "73931d4b0e617dcf07fd50f90c15a83dc664d277",
      [
       null,
       {
@@ -525149,7 +525294,7 @@
       ]
      ],
      "detached-context.https.html": [
-      "c9015b809301ad706cbcd7eda9f17c88323df3e5",
+      "cbb818f7ac0ebcb87ea53d94e85b5045d9ead35e",
       [
        null,
        {}
@@ -525280,6 +525425,13 @@
        {}
       ]
      ],
+     "fetch-event-handled.https.html": [
+      "2d6f6c86d876daf40ea8f41be01bca2c549bcc41",
+      [
+       null,
+       {}
+      ]
+     ],
      "fetch-event-network-error.https.html": [
       "fea2ad1e3c26effcc9fd7c8d7a66917e420606b4",
       [
@@ -525696,7 +525848,7 @@
       ]
      },
      "multipart-image.https.html": [
-      "98336d7d9e23f9be2d8ce3033903b3ff90c841c5",
+      "00c20d25f90ac38c33ba57ced62d82798481dd42",
       [
        null,
        {}
@@ -547868,7 +548020,7 @@
      ]
     ],
     "NDEFRecord_constructor.https.html": [
-     "4772407baafb029cd10c09f6434fd71f703905a8",
+     "6d6b8117ef03fc8a1357e3eec4b10e39a9cc7dac",
      [
       null,
       {}
@@ -549465,132 +549617,150 @@
    },
    "webauthn": {
     "createcredential-badargs-attestation.https.html": [
-     "6bce3233a1c029fb705a245afd0913beab1f56e7",
-     [
-      null,
-      {}
-     ]
-    ],
-    "createcredential-badargs-authnrselection.https.html": [
-     "87bdb040055b403b3fca64b3ae6e0e80e2cffd65",
+     "1bdebbbf2b286f69eecd0774ac9bdfb96c20a50b",
      [
       null,
       {
+       "testdriver": true
+      }
+     ]
+    ],
+    "createcredential-badargs-authnrselection.https.html": [
+     "5da0745734ffbfbcd0d1658e4f4c1914d9940611",
+     [
+      null,
+      {
+       "testdriver": true,
        "timeout": "long"
       }
      ]
     ],
     "createcredential-badargs-challenge.https.html": [
-     "554fc0ec43b8d7265b8f0bf003641a9f5cba150c",
+     "4fa41df11dd43d720cc9467580913455ab2a60ec",
      [
       null,
       {
+       "testdriver": true,
        "timeout": "long"
       }
      ]
     ],
     "createcredential-badargs-rp.https.html": [
-     "890ba21a81bb2bcc585a2c3969f2155f54361b4b",
+     "cbd86b8f083e3d1d3b28842b9fa5759047cfac1e",
      [
       null,
       {
+       "testdriver": true,
        "timeout": "long"
       }
      ]
     ],
     "createcredential-badargs-user.https.html": [
-     "070a5c77dea294d340033424872a774786167986",
+     "e487242571769125238e87f0d22731a54c58bed5",
      [
       null,
       {
+       "testdriver": true,
        "timeout": "long"
       }
      ]
     ],
     "createcredential-excludecredentials.https.html": [
-     "f084d00864f140070c67fa523edc1efce20aab82",
+     "3a5af481fcac6cd1f9f0e1e95caab7ba7a7facb4",
      [
       null,
       {
+       "testdriver": true,
        "timeout": "long"
       }
      ]
     ],
     "createcredential-extensions.https.html": [
-     "f4a05c3042f8172dcdc4737a30c15af4bd6af8d4",
+     "036200dbbf949e7d0b274e44cc88e7aef1366cb8",
      [
       null,
       {
+       "testdriver": true,
        "timeout": "long"
       }
      ]
     ],
     "createcredential-passing.https.html": [
-     "92ef14912ba6fb7aaec85ce207d236d29d87b6bc",
+     "ab10c7f519a6868c28c233fa6f933da925fe3dc9",
      [
       null,
       {
+       "testdriver": true,
        "timeout": "long"
       }
      ]
     ],
     "createcredential-pubkeycredparams.https.html": [
-     "34622fdf74e50b65a425488a94f17cbc4364b59f",
+     "c845a90687576a2d33b7f459c293aa74a15c1fb9",
      [
       null,
       {
+       "testdriver": true,
        "timeout": "long"
       }
      ]
     ],
     "createcredential-timeout.https.html": [
-     "d4aa459240b732dfdcebdd85c2afccd862a9d947",
-     [
-      null,
-      {}
-     ]
-    ],
-    "getcredential-badargs-rpid.https.html": [
-     "956b26fb9d96d2a6f5c320da3de6fc1e5e5de2b1",
+     "09af4520ae87f3540772d3d257d385dfc3647058",
      [
       null,
       {
+       "testdriver": true,
+       "timeout": "long"
+      }
+     ]
+    ],
+    "getcredential-badargs-rpid.https.html": [
+     "6e0ef5f201842f878d4cc2cd38a05e1923c992a8",
+     [
+      null,
+      {
+       "testdriver": true,
        "timeout": "long"
       }
      ]
     ],
     "getcredential-badargs-userverification.https.html": [
-     "5bc579bc3335e56aa71adcc5d3a58bab8d51f898",
+     "7f8571586e4094e663399b79f473676cdfb0a660",
      [
       null,
       {
+       "testdriver": true,
        "timeout": "long"
       }
      ]
     ],
     "getcredential-extensions.https.html": [
-     "763f48b70f34428e83a3a5d6419e7726d45211bb",
+     "820f9b529f16e5644d3d288f406db6e71a72cf34",
      [
       null,
       {
+       "testdriver": true,
        "timeout": "long"
       }
      ]
     ],
     "getcredential-passing.https.html": [
-     "86dd668d49518f7d18ba6dbd848f8ed2e012cf5d",
+     "dae05e0993a0358ec77c3c2c7981c39a7483c82e",
      [
       null,
       {
+       "testdriver": true,
        "timeout": "long"
       }
      ]
     ],
     "getcredential-timeout.https.html": [
-     "e6cd884ae064a59976c9191ff09da106e6de9739",
+     "228ef50978971c2b17882c5f33ad4e68da61b44f",
      [
       null,
       {
+       "testdriver": true,
        "timeout": "long"
       }
      ]
@@ -549623,14 +549793,14 @@
      ]
     ],
     "securecontext.http.html": [
-     "52786950f383eb0454edcf9fad9b637dde956ca8",
+     "27d2dbfce3e9c15c453597fc53b745426d33aae4",
      [
       null,
       {}
      ]
     ],
     "securecontext.https.html": [
-     "6c9aabd11ea3a51688962890dde29d5c41ec6c6f",
+     "f927004702443be4d23f2c206ee1b4d07a0e1bea",
      [
       null,
       {}
@@ -550029,7 +550199,7 @@
     ],
     "broadcastchannel": {
      "basics.html": [
-      "3d8ba76fb1ba35658c44702059925fe53e3fb6f6",
+      "ed16e32f5437dc430b5cc11b967e6538ef6cf393",
       [
        null,
        {}
@@ -550193,14 +550363,14 @@
      ]
     ],
     "postMessage_Document.htm": [
-     "a5580ef4b2b9137fc9add8ab1eb9a8f224dc6a80",
+     "c00a09a8658557c14d4c2925affb2660b9bd76bf",
      [
       null,
       {}
      ]
     ],
     "postMessage_Function.htm": [
-     "fd31f83df4b75fe36a3a8581c81d230888b3a879",
+     "3976cebb747bbe92bf1dc671a297b502954c52e9",
      [
       null,
       {}
@@ -550249,14 +550419,14 @@
      ]
     ],
     "postMessage_dup_transfer_objects.htm": [
-     "511b51271f30a2655951e8556488621a7095b826",
+     "ade9515d3acd42e1a12bd97627a57f7a13e75787",
      [
       null,
       {}
      ]
     ],
     "postMessage_invalid_targetOrigin.htm": [
-     "b9cc6377ef82a511264857f5b1bf424ef08d007d",
+     "e2b39df22df1bbe07f1220b4def7998a5a3f641d",
      [
       null,
       {}
@@ -551093,7 +551263,7 @@
      ]
     ],
     "RTCPeerConnection-onnegotiationneeded.html": [
-     "3e31c327ac2480bb9d526e5c6665c3486449ff31",
+     "3b65faca927fad96d45911350be355a1886ba3fb",
      [
       null,
       {}
@@ -551228,7 +551398,7 @@
      ]
     ],
     "RTCPeerConnection-setRemoteDescription-rollback.html": [
-     "66067dae69672b357d88ebb6fe5845f817c09cc9",
+     "516cb57025b195552ade0e600c02f7c92c8f4aa8",
      [
       null,
       {}
@@ -551597,6 +551767,15 @@
        }
       ]
      ],
+     "ice-ufragpwd.html": [
+      "bd151284cbb70592d71c67ddfd89c230e737a21f",
+      [
+       null,
+       {
+        "timeout": "long"
+       }
+      ]
+     ],
      "jsep-initial-offer.https.html": [
       "50527f88dfe8f3f025cfffae91b347fdc2527a1d",
       [
@@ -557211,7 +557390,7 @@
     },
     "dom-overlay": {
      "ar_dom_overlay.https.html": [
-      "d63197c46a56f622e959420fb07d64b0840e6083",
+      "15eac78d9288b507cbd58143c94ea545145d9441",
       [
        null,
        {}
@@ -557260,6 +557439,13 @@
       {}
      ]
     ],
+    "events_session_squeeze.https.html": [
+     "59e4e3f72c5d63cff47b6a7e1dfbac6194203534",
+     [
+      null,
+      {}
+     ]
+    ],
     "exclusive_requestFrame_nolayer.https.html": [
      "f76847a8769073bb4753702f32dd5c2ccc9d3532",
      [
@@ -557962,7 +558148,7 @@
      ]
     ],
     "Worker-constructor-proto.any.js": [
-     "90ad767b9807853f6fbc611dbeac435b4c14079b",
+     "f0544b6c15a9bf54333cff1ab7299d2445cf358b",
      [
       "workers/Worker-constructor-proto.any.serviceworker.html",
       {
@@ -562190,14 +562376,14 @@
      ]
     ],
     "open-url-multi-window-2.htm": [
-     "fdd91016db8c3ecc93bafee43dade4aea2a44ea2",
+     "64cc96b61b25dc6647d0eb64bb4d945a5072f1d5",
      [
       null,
       {}
      ]
     ],
     "open-url-multi-window-3.htm": [
-     "cfce8310dc42b916ed958e69f0b4761c694f2619",
+     "e156857fe05daa4e3a47a3ca413a9c9abaa062bc",
      [
       null,
       {}
@@ -562211,7 +562397,7 @@
      ]
     ],
     "open-url-multi-window-5.htm": [
-     "40a3429fbb472a7396bc7d0475cd0f6b0c23e6e7",
+     "32c467a4956c4b47614b832bbe7111efc7c4139e",
      [
       null,
       {}
diff --git a/tests/wpt/metadata/WebCryptoAPI/idlharness.https.any.js.ini b/tests/wpt/metadata/WebCryptoAPI/idlharness.https.any.js.ini
index d489c813cca..bce2e9a48e8 100644
--- a/tests/wpt/metadata/WebCryptoAPI/idlharness.https.any.js.ini
+++ b/tests/wpt/metadata/WebCryptoAPI/idlharness.https.any.js.ini
@@ -1,232 +1,417 @@
 [idlharness.https.any.html]
   [idlharness]
     expected: FAIL
+
   [Crypto interface: attribute subtle]
     expected: FAIL
+
   [Crypto interface: crypto must inherit property "subtle" with the proper type]
     expected: FAIL
+
   [CryptoKey interface: existence and properties of interface object]
     expected: FAIL
+
   [CryptoKey interface object length]
     expected: FAIL
+
   [CryptoKey interface object name]
     expected: FAIL
+
   [CryptoKey interface: existence and properties of interface prototype object]
     expected: FAIL
+
   [CryptoKey interface: existence and properties of interface prototype object's "constructor" property]
     expected: FAIL
+
   [CryptoKey interface: existence and properties of interface prototype object's @@unscopables property]
     expected: FAIL
+
   [CryptoKey interface: attribute type]
     expected: FAIL
+
   [CryptoKey interface: attribute extractable]
     expected: FAIL
+
   [CryptoKey interface: attribute algorithm]
     expected: FAIL
+
   [CryptoKey interface: attribute usages]
     expected: FAIL
+
   [SubtleCrypto interface: existence and properties of interface object]
     expected: FAIL
+
   [SubtleCrypto interface object length]
     expected: FAIL
+
   [SubtleCrypto interface object name]
     expected: FAIL
+
   [SubtleCrypto interface: existence and properties of interface prototype object]
     expected: FAIL
+
   [SubtleCrypto interface: existence and properties of interface prototype object's "constructor" property]
     expected: FAIL
+
   [SubtleCrypto interface: existence and properties of interface prototype object's @@unscopables property]
     expected: FAIL
+
   [SubtleCrypto interface: operation encrypt(AlgorithmIdentifier, CryptoKey, BufferSource)]
     expected: FAIL
+
   [SubtleCrypto interface: operation decrypt(AlgorithmIdentifier, CryptoKey, BufferSource)]
     expected: FAIL
+
   [SubtleCrypto interface: operation sign(AlgorithmIdentifier, CryptoKey, BufferSource)]
     expected: FAIL
+
   [SubtleCrypto interface: operation verify(AlgorithmIdentifier, CryptoKey, BufferSource, BufferSource)]
     expected: FAIL
+
   [SubtleCrypto interface: operation digest(AlgorithmIdentifier, BufferSource)]
     expected: FAIL
-  [SubtleCrypto interface: operation generateKey(AlgorithmIdentifier, boolean, \[object Object\])]
+
+  [SubtleCrypto interface: operation generateKey(AlgorithmIdentifier, boolean, [object Object\])]
     expected: FAIL
-  [SubtleCrypto interface: operation deriveKey(AlgorithmIdentifier, CryptoKey, AlgorithmIdentifier, boolean, \[object Object\])]
+
+  [SubtleCrypto interface: operation deriveKey(AlgorithmIdentifier, CryptoKey, AlgorithmIdentifier, boolean, [object Object\])]
     expected: FAIL
+
   [SubtleCrypto interface: operation deriveBits(AlgorithmIdentifier, CryptoKey, unsigned long)]
     expected: FAIL
-  [SubtleCrypto interface: operation importKey(KeyFormat, \[object Object\],\[object Object\], AlgorithmIdentifier, boolean, \[object Object\])]
+
+  [SubtleCrypto interface: operation importKey(KeyFormat, [object Object\],[object Object\], AlgorithmIdentifier, boolean, [object Object\])]
     expected: FAIL
+
   [SubtleCrypto interface: operation exportKey(KeyFormat, CryptoKey)]
     expected: FAIL
+
   [SubtleCrypto interface: operation wrapKey(KeyFormat, CryptoKey, CryptoKey, AlgorithmIdentifier)]
     expected: FAIL
-  [SubtleCrypto interface: operation unwrapKey(KeyFormat, BufferSource, CryptoKey, AlgorithmIdentifier, AlgorithmIdentifier, boolean, \[object Object\])]
+
+  [SubtleCrypto interface: operation unwrapKey(KeyFormat, BufferSource, CryptoKey, AlgorithmIdentifier, AlgorithmIdentifier, boolean, [object Object\])]
     expected: FAIL
+
   [SubtleCrypto must be primary interface of crypto.subtle]
     expected: FAIL
+
   [Stringification of crypto.subtle]
     expected: FAIL
+
   [SubtleCrypto interface: crypto.subtle must inherit property "encrypt(AlgorithmIdentifier, CryptoKey, BufferSource)" with the proper type]
     expected: FAIL
+
   [SubtleCrypto interface: calling encrypt(AlgorithmIdentifier, CryptoKey, BufferSource) on crypto.subtle with too few arguments must throw TypeError]
     expected: FAIL
+
   [SubtleCrypto interface: crypto.subtle must inherit property "decrypt(AlgorithmIdentifier, CryptoKey, BufferSource)" with the proper type]
     expected: FAIL
+
   [SubtleCrypto interface: calling decrypt(AlgorithmIdentifier, CryptoKey, BufferSource) on crypto.subtle with too few arguments must throw TypeError]
     expected: FAIL
+
   [SubtleCrypto interface: crypto.subtle must inherit property "sign(AlgorithmIdentifier, CryptoKey, BufferSource)" with the proper type]
     expected: FAIL
+
   [SubtleCrypto interface: calling sign(AlgorithmIdentifier, CryptoKey, BufferSource) on crypto.subtle with too few arguments must throw TypeError]
     expected: FAIL
+
   [SubtleCrypto interface: crypto.subtle must inherit property "verify(AlgorithmIdentifier, CryptoKey, BufferSource, BufferSource)" with the proper type]
     expected: FAIL
+
   [SubtleCrypto interface: calling verify(AlgorithmIdentifier, CryptoKey, BufferSource, BufferSource) on crypto.subtle with too few arguments must throw TypeError]
     expected: FAIL
+
   [SubtleCrypto interface: crypto.subtle must inherit property "digest(AlgorithmIdentifier, BufferSource)" with the proper type]
     expected: FAIL
+
   [SubtleCrypto interface: calling digest(AlgorithmIdentifier, BufferSource) on crypto.subtle with too few arguments must throw TypeError]
     expected: FAIL
-  [SubtleCrypto interface: crypto.subtle must inherit property "generateKey(AlgorithmIdentifier, boolean, \[object Object\])" with the proper type]
+
+  [SubtleCrypto interface: crypto.subtle must inherit property "generateKey(AlgorithmIdentifier, boolean, [object Object\])" with the proper type]
     expected: FAIL
-  [SubtleCrypto interface: calling generateKey(AlgorithmIdentifier, boolean, \[object Object\]) on crypto.subtle with too few arguments must throw TypeError]
+
+  [SubtleCrypto interface: calling generateKey(AlgorithmIdentifier, boolean, [object Object\]) on crypto.subtle with too few arguments must throw TypeError]
     expected: FAIL
-  [SubtleCrypto interface: crypto.subtle must inherit property "deriveKey(AlgorithmIdentifier, CryptoKey, AlgorithmIdentifier, boolean, \[object Object\])" with the proper type]
+
+  [SubtleCrypto interface: crypto.subtle must inherit property "deriveKey(AlgorithmIdentifier, CryptoKey, AlgorithmIdentifier, boolean, [object Object\])" with the proper type]
     expected: FAIL
-  [SubtleCrypto interface: calling deriveKey(AlgorithmIdentifier, CryptoKey, AlgorithmIdentifier, boolean, \[object Object\]) on crypto.subtle with too few arguments must throw TypeError]
+
+  [SubtleCrypto interface: calling deriveKey(AlgorithmIdentifier, CryptoKey, AlgorithmIdentifier, boolean, [object Object\]) on crypto.subtle with too few arguments must throw TypeError]
     expected: FAIL
+
   [SubtleCrypto interface: crypto.subtle must inherit property "deriveBits(AlgorithmIdentifier, CryptoKey, unsigned long)" with the proper type]
     expected: FAIL
+
   [SubtleCrypto interface: calling deriveBits(AlgorithmIdentifier, CryptoKey, unsigned long) on crypto.subtle with too few arguments must throw TypeError]
     expected: FAIL
-  [SubtleCrypto interface: crypto.subtle must inherit property "importKey(KeyFormat, \[object Object\],\[object Object\], AlgorithmIdentifier, boolean, \[object Object\])" with the proper type]
+
+  [SubtleCrypto interface: crypto.subtle must inherit property "importKey(KeyFormat, [object Object\],[object Object\], AlgorithmIdentifier, boolean, [object Object\])" with the proper type]
     expected: FAIL
-  [SubtleCrypto interface: calling importKey(KeyFormat, \[object Object\],\[object Object\], AlgorithmIdentifier, boolean, \[object Object\]) on crypto.subtle with too few arguments must throw TypeError]
+
+  [SubtleCrypto interface: calling importKey(KeyFormat, [object Object\],[object Object\], AlgorithmIdentifier, boolean, [object Object\]) on crypto.subtle with too few arguments must throw TypeError]
     expected: FAIL
+
   [SubtleCrypto interface: crypto.subtle must inherit property "exportKey(KeyFormat, CryptoKey)" with the proper type]
     expected: FAIL
+
   [SubtleCrypto interface: calling exportKey(KeyFormat, CryptoKey) on crypto.subtle with too few arguments must throw TypeError]
     expected: FAIL
+
   [SubtleCrypto interface: crypto.subtle must inherit property "wrapKey(KeyFormat, CryptoKey, CryptoKey, AlgorithmIdentifier)" with the proper type]
     expected: FAIL
+
   [SubtleCrypto interface: calling wrapKey(KeyFormat, CryptoKey, CryptoKey, AlgorithmIdentifier) on crypto.subtle with too few arguments must throw TypeError]
     expected: FAIL
-  [SubtleCrypto interface: crypto.subtle must inherit property "unwrapKey(KeyFormat, BufferSource, CryptoKey, AlgorithmIdentifier, AlgorithmIdentifier, boolean, \[object Object\])" with the proper type]
+
+  [SubtleCrypto interface: crypto.subtle must inherit property "unwrapKey(KeyFormat, BufferSource, CryptoKey, AlgorithmIdentifier, AlgorithmIdentifier, boolean, [object Object\])" with the proper type]
     expected: FAIL
-  [SubtleCrypto interface: calling unwrapKey(KeyFormat, BufferSource, CryptoKey, AlgorithmIdentifier, AlgorithmIdentifier, boolean, \[object Object\]) on crypto.subtle with too few arguments must throw TypeError]
+
+  [SubtleCrypto interface: calling unwrapKey(KeyFormat, BufferSource, CryptoKey, AlgorithmIdentifier, AlgorithmIdentifier, boolean, [object Object\]) on crypto.subtle with too few arguments must throw TypeError]
     expected: FAIL
- 
+
+  [SubtleCrypto interface: operation unwrapKey(KeyFormat, BufferSource, CryptoKey, AlgorithmIdentifier, AlgorithmIdentifier, boolean, sequence<KeyUsage>)]
+    expected: FAIL
+
+  [SubtleCrypto interface: crypto.subtle must inherit property "unwrapKey(KeyFormat, BufferSource, CryptoKey, AlgorithmIdentifier, AlgorithmIdentifier, boolean, sequence<KeyUsage>)" with the proper type]
+    expected: FAIL
+
+  [SubtleCrypto interface: crypto.subtle must inherit property "importKey(KeyFormat, (BufferSource or JsonWebKey), AlgorithmIdentifier, boolean, sequence<KeyUsage>)" with the proper type]
+    expected: FAIL
+
+  [SubtleCrypto interface: crypto.subtle must inherit property "generateKey(AlgorithmIdentifier, boolean, sequence<KeyUsage>)" with the proper type]
+    expected: FAIL
+
+  [SubtleCrypto interface: calling importKey(KeyFormat, (BufferSource or JsonWebKey), AlgorithmIdentifier, boolean, sequence<KeyUsage>) on crypto.subtle with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SubtleCrypto interface: operation deriveKey(AlgorithmIdentifier, CryptoKey, AlgorithmIdentifier, boolean, sequence<KeyUsage>)]
+    expected: FAIL
+
+  [SubtleCrypto interface: calling unwrapKey(KeyFormat, BufferSource, CryptoKey, AlgorithmIdentifier, AlgorithmIdentifier, boolean, sequence<KeyUsage>) on crypto.subtle with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SubtleCrypto interface: operation generateKey(AlgorithmIdentifier, boolean, sequence<KeyUsage>)]
+    expected: FAIL
+
+  [SubtleCrypto interface: crypto.subtle must inherit property "deriveKey(AlgorithmIdentifier, CryptoKey, AlgorithmIdentifier, boolean, sequence<KeyUsage>)" with the proper type]
+    expected: FAIL
+
+  [SubtleCrypto interface: operation importKey(KeyFormat, (BufferSource or JsonWebKey), AlgorithmIdentifier, boolean, sequence<KeyUsage>)]
+    expected: FAIL
+
+  [SubtleCrypto interface: calling deriveKey(AlgorithmIdentifier, CryptoKey, AlgorithmIdentifier, boolean, sequence<KeyUsage>) on crypto.subtle with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SubtleCrypto interface: calling generateKey(AlgorithmIdentifier, boolean, sequence<KeyUsage>) on crypto.subtle with too few arguments must throw TypeError]
+    expected: FAIL
+
 
 [idlharness.https.any.worker.html]
   [idlharness]
     expected: FAIL
+
   [Crypto interface: attribute subtle]
     expected: FAIL
+
   [Crypto interface: crypto must inherit property "subtle" with the proper type]
     expected: FAIL
+
   [CryptoKey interface: existence and properties of interface object]
     expected: FAIL
+
   [CryptoKey interface object length]
     expected: FAIL
+
   [CryptoKey interface object name]
     expected: FAIL
+
   [CryptoKey interface: existence and properties of interface prototype object]
     expected: FAIL
+
   [CryptoKey interface: existence and properties of interface prototype object's "constructor" property]
     expected: FAIL
+
   [CryptoKey interface: existence and properties of interface prototype object's @@unscopables property]
     expected: FAIL
+
   [CryptoKey interface: attribute type]
     expected: FAIL
+
   [CryptoKey interface: attribute extractable]
     expected: FAIL
+
   [CryptoKey interface: attribute algorithm]
     expected: FAIL
+
   [CryptoKey interface: attribute usages]
     expected: FAIL
+
   [SubtleCrypto interface: existence and properties of interface object]
     expected: FAIL
+
   [SubtleCrypto interface object length]
     expected: FAIL
+
   [SubtleCrypto interface object name]
     expected: FAIL
+
   [SubtleCrypto interface: existence and properties of interface prototype object]
     expected: FAIL
+
   [SubtleCrypto interface: existence and properties of interface prototype object's "constructor" property]
     expected: FAIL
+
   [SubtleCrypto interface: existence and properties of interface prototype object's @@unscopables property]
     expected: FAIL
+
   [SubtleCrypto interface: operation encrypt(AlgorithmIdentifier, CryptoKey, BufferSource)]
     expected: FAIL
+
   [SubtleCrypto interface: operation decrypt(AlgorithmIdentifier, CryptoKey, BufferSource)]
     expected: FAIL
+
   [SubtleCrypto interface: operation sign(AlgorithmIdentifier, CryptoKey, BufferSource)]
     expected: FAIL
+
   [SubtleCrypto interface: operation verify(AlgorithmIdentifier, CryptoKey, BufferSource, BufferSource)]
     expected: FAIL
+
   [SubtleCrypto interface: operation digest(AlgorithmIdentifier, BufferSource)]
     expected: FAIL
-  [SubtleCrypto interface: operation generateKey(AlgorithmIdentifier, boolean, \[object Object\])]
+
+  [SubtleCrypto interface: operation generateKey(AlgorithmIdentifier, boolean, [object Object\])]
     expected: FAIL
-  [SubtleCrypto interface: operation deriveKey(AlgorithmIdentifier, CryptoKey, AlgorithmIdentifier, boolean, \[object Object\])]
+
+  [SubtleCrypto interface: operation deriveKey(AlgorithmIdentifier, CryptoKey, AlgorithmIdentifier, boolean, [object Object\])]
     expected: FAIL
+
   [SubtleCrypto interface: operation deriveBits(AlgorithmIdentifier, CryptoKey, unsigned long)]
     expected: FAIL
-  [SubtleCrypto interface: operation importKey(KeyFormat, \[object Object\],\[object Object\], AlgorithmIdentifier, boolean, \[object Object\])]
+
+  [SubtleCrypto interface: operation importKey(KeyFormat, [object Object\],[object Object\], AlgorithmIdentifier, boolean, [object Object\])]
     expected: FAIL
+
   [SubtleCrypto interface: operation exportKey(KeyFormat, CryptoKey)]
     expected: FAIL
+
   [SubtleCrypto interface: operation wrapKey(KeyFormat, CryptoKey, CryptoKey, AlgorithmIdentifier)]
     expected: FAIL
-  [SubtleCrypto interface: operation unwrapKey(KeyFormat, BufferSource, CryptoKey, AlgorithmIdentifier, AlgorithmIdentifier, boolean, \[object Object\])]
+
+  [SubtleCrypto interface: operation unwrapKey(KeyFormat, BufferSource, CryptoKey, AlgorithmIdentifier, AlgorithmIdentifier, boolean, [object Object\])]
     expected: FAIL
+
   [SubtleCrypto must be primary interface of crypto.subtle]
     expected: FAIL
+
   [Stringification of crypto.subtle]
     expected: FAIL
+
   [SubtleCrypto interface: crypto.subtle must inherit property "encrypt(AlgorithmIdentifier, CryptoKey, BufferSource)" with the proper type]
     expected: FAIL
+
   [SubtleCrypto interface: calling encrypt(AlgorithmIdentifier, CryptoKey, BufferSource) on crypto.subtle with too few arguments must throw TypeError]
     expected: FAIL
+
   [SubtleCrypto interface: crypto.subtle must inherit property "decrypt(AlgorithmIdentifier, CryptoKey, BufferSource)" with the proper type]
     expected: FAIL
+
   [SubtleCrypto interface: calling decrypt(AlgorithmIdentifier, CryptoKey, BufferSource) on crypto.subtle with too few arguments must throw TypeError]
     expected: FAIL
+
   [SubtleCrypto interface: crypto.subtle must inherit property "sign(AlgorithmIdentifier, CryptoKey, BufferSource)" with the proper type]
     expected: FAIL
+
   [SubtleCrypto interface: calling sign(AlgorithmIdentifier, CryptoKey, BufferSource) on crypto.subtle with too few arguments must throw TypeError]
     expected: FAIL
+
   [SubtleCrypto interface: crypto.subtle must inherit property "verify(AlgorithmIdentifier, CryptoKey, BufferSource, BufferSource)" with the proper type]
     expected: FAIL
+
   [SubtleCrypto interface: calling verify(AlgorithmIdentifier, CryptoKey, BufferSource, BufferSource) on crypto.subtle with too few arguments must throw TypeError]
     expected: FAIL
+
   [SubtleCrypto interface: crypto.subtle must inherit property "digest(AlgorithmIdentifier, BufferSource)" with the proper type]
     expected: FAIL
+
   [SubtleCrypto interface: calling digest(AlgorithmIdentifier, BufferSource) on crypto.subtle with too few arguments must throw TypeError]
     expected: FAIL
-  [SubtleCrypto interface: crypto.subtle must inherit property "generateKey(AlgorithmIdentifier, boolean, \[object Object\])" with the proper type]
+
+  [SubtleCrypto interface: crypto.subtle must inherit property "generateKey(AlgorithmIdentifier, boolean, [object Object\])" with the proper type]
     expected: FAIL
-  [SubtleCrypto interface: calling generateKey(AlgorithmIdentifier, boolean, \[object Object\]) on crypto.subtle with too few arguments must throw TypeError]
+
+  [SubtleCrypto interface: calling generateKey(AlgorithmIdentifier, boolean, [object Object\]) on crypto.subtle with too few arguments must throw TypeError]
     expected: FAIL
-  [SubtleCrypto interface: crypto.subtle must inherit property "deriveKey(AlgorithmIdentifier, CryptoKey, AlgorithmIdentifier, boolean, \[object Object\])" with the proper type]
+
+  [SubtleCrypto interface: crypto.subtle must inherit property "deriveKey(AlgorithmIdentifier, CryptoKey, AlgorithmIdentifier, boolean, [object Object\])" with the proper type]
     expected: FAIL
-  [SubtleCrypto interface: calling deriveKey(AlgorithmIdentifier, CryptoKey, AlgorithmIdentifier, boolean, \[object Object\]) on crypto.subtle with too few arguments must throw TypeError]
+
+  [SubtleCrypto interface: calling deriveKey(AlgorithmIdentifier, CryptoKey, AlgorithmIdentifier, boolean, [object Object\]) on crypto.subtle with too few arguments must throw TypeError]
     expected: FAIL
+
   [SubtleCrypto interface: crypto.subtle must inherit property "deriveBits(AlgorithmIdentifier, CryptoKey, unsigned long)" with the proper type]
     expected: FAIL
+
   [SubtleCrypto interface: calling deriveBits(AlgorithmIdentifier, CryptoKey, unsigned long) on crypto.subtle with too few arguments must throw TypeError]
     expected: FAIL
-  [SubtleCrypto interface: crypto.subtle must inherit property "importKey(KeyFormat, \[object Object\],\[object Object\], AlgorithmIdentifier, boolean, \[object Object\])" with the proper type]
+
+  [SubtleCrypto interface: crypto.subtle must inherit property "importKey(KeyFormat, [object Object\],[object Object\], AlgorithmIdentifier, boolean, [object Object\])" with the proper type]
     expected: FAIL
-  [SubtleCrypto interface: calling importKey(KeyFormat, \[object Object\],\[object Object\], AlgorithmIdentifier, boolean, \[object Object\]) on crypto.subtle with too few arguments must throw TypeError]
+
+  [SubtleCrypto interface: calling importKey(KeyFormat, [object Object\],[object Object\], AlgorithmIdentifier, boolean, [object Object\]) on crypto.subtle with too few arguments must throw TypeError]
     expected: FAIL
+
   [SubtleCrypto interface: crypto.subtle must inherit property "exportKey(KeyFormat, CryptoKey)" with the proper type]
     expected: FAIL
+
   [SubtleCrypto interface: calling exportKey(KeyFormat, CryptoKey) on crypto.subtle with too few arguments must throw TypeError]
     expected: FAIL
+
   [SubtleCrypto interface: crypto.subtle must inherit property "wrapKey(KeyFormat, CryptoKey, CryptoKey, AlgorithmIdentifier)" with the proper type]
     expected: FAIL
-  [SubtleCrypto interface: calling wrapKey(KeyFormat, CryptoKey, CryptoKey, AlgorithmIdentifier) on crypto.subtle with too few arguments must throw TypeError]  
+
+  [SubtleCrypto interface: calling wrapKey(KeyFormat, CryptoKey, CryptoKey, AlgorithmIdentifier) on crypto.subtle with too few arguments must throw TypeError]
     expected: FAIL
-  [SubtleCrypto interface: crypto.subtle must inherit property "unwrapKey(KeyFormat, BufferSource, CryptoKey, AlgorithmIdentifier, AlgorithmIdentifier, boolean, \[object Object\])" with the proper type]
+
+  [SubtleCrypto interface: crypto.subtle must inherit property "unwrapKey(KeyFormat, BufferSource, CryptoKey, AlgorithmIdentifier, AlgorithmIdentifier, boolean, [object Object\])" with the proper type]
     expected: FAIL
-  [SubtleCrypto interface: calling unwrapKey(KeyFormat, BufferSource, CryptoKey, AlgorithmIdentifier, AlgorithmIdentifier, boolean, \[object Object\]) on crypto.subtle with too few arguments must throw TypeError]
+
+  [SubtleCrypto interface: calling unwrapKey(KeyFormat, BufferSource, CryptoKey, AlgorithmIdentifier, AlgorithmIdentifier, boolean, [object Object\]) on crypto.subtle with too few arguments must throw TypeError]
     expected: FAIL
+
+  [SubtleCrypto interface: operation unwrapKey(KeyFormat, BufferSource, CryptoKey, AlgorithmIdentifier, AlgorithmIdentifier, boolean, sequence<KeyUsage>)]
+    expected: FAIL
+
+  [SubtleCrypto interface: crypto.subtle must inherit property "unwrapKey(KeyFormat, BufferSource, CryptoKey, AlgorithmIdentifier, AlgorithmIdentifier, boolean, sequence<KeyUsage>)" with the proper type]
+    expected: FAIL
+
+  [SubtleCrypto interface: crypto.subtle must inherit property "importKey(KeyFormat, (BufferSource or JsonWebKey), AlgorithmIdentifier, boolean, sequence<KeyUsage>)" with the proper type]
+    expected: FAIL
+
+  [SubtleCrypto interface: crypto.subtle must inherit property "generateKey(AlgorithmIdentifier, boolean, sequence<KeyUsage>)" with the proper type]
+    expected: FAIL
+
+  [SubtleCrypto interface: calling importKey(KeyFormat, (BufferSource or JsonWebKey), AlgorithmIdentifier, boolean, sequence<KeyUsage>) on crypto.subtle with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SubtleCrypto interface: operation deriveKey(AlgorithmIdentifier, CryptoKey, AlgorithmIdentifier, boolean, sequence<KeyUsage>)]
+    expected: FAIL
+
+  [SubtleCrypto interface: calling unwrapKey(KeyFormat, BufferSource, CryptoKey, AlgorithmIdentifier, AlgorithmIdentifier, boolean, sequence<KeyUsage>) on crypto.subtle with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SubtleCrypto interface: operation generateKey(AlgorithmIdentifier, boolean, sequence<KeyUsage>)]
+    expected: FAIL
+
+  [SubtleCrypto interface: crypto.subtle must inherit property "deriveKey(AlgorithmIdentifier, CryptoKey, AlgorithmIdentifier, boolean, sequence<KeyUsage>)" with the proper type]
+    expected: FAIL
+
+  [SubtleCrypto interface: operation importKey(KeyFormat, (BufferSource or JsonWebKey), AlgorithmIdentifier, boolean, sequence<KeyUsage>)]
+    expected: FAIL
+
+  [SubtleCrypto interface: calling deriveKey(AlgorithmIdentifier, CryptoKey, AlgorithmIdentifier, boolean, sequence<KeyUsage>) on crypto.subtle with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SubtleCrypto interface: calling generateKey(AlgorithmIdentifier, boolean, sequence<KeyUsage>) on crypto.subtle with too few arguments must throw TypeError]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/bluetooth/idl/idlharness.tentative.https.window.js.ini b/tests/wpt/metadata/bluetooth/idl/idlharness.tentative.https.window.js.ini
index e85766f5e1d..58f6917c666 100644
--- a/tests/wpt/metadata/bluetooth/idl/idlharness.tentative.https.window.js.ini
+++ b/tests/wpt/metadata/bluetooth/idl/idlharness.tentative.https.window.js.ini
@@ -216,4 +216,26 @@
     expected: FAIL
 
   [BluetoothRemoteGATTCharacteristic interface: operation writeValueWithoutResponse(BufferSource)]
-    expected: FAIL
\ No newline at end of file
+    expected: FAIL
+
+  [Bluetooth interface: navigator.bluetooth must inherit property "getDevices()" with the proper type]
+    expected: FAIL
+
+  [Bluetooth interface: operation requestDevice(optional RequestDeviceOptions)]
+    expected: FAIL
+
+  [BluetoothRemoteGATTCharacteristic interface: operation getDescriptors(optional BluetoothDescriptorUUID)]
+    expected: FAIL
+
+  [Bluetooth interface: operation getDevices()]
+    expected: FAIL
+
+  [BluetoothRemoteGATTService interface: operation getIncludedServices(optional BluetoothServiceUUID)]
+    expected: FAIL
+
+  [BluetoothRemoteGATTServer interface: operation getPrimaryServices(optional BluetoothServiceUUID)]
+    expected: FAIL
+
+  [BluetoothRemoteGATTService interface: operation getCharacteristics(optional BluetoothCharacteristicUUID)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini
deleted file mode 100644
index f64b45fea6b..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-002.html]
-  [Hit test float]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
similarity index 67%
rename from tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
rename to tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
index f29da48a2a0..4bfb0c2053a 100644
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
+++ b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
@@ -1,4 +1,4 @@
-[hit-test-floats-003.html]
+[hit-test-floats-004.html]
   [Miss float below something else]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/css/css-fonts/idlharness.html.ini b/tests/wpt/metadata/css/css-fonts/idlharness.html.ini
index e81cba11107..0f59480628a 100644
--- a/tests/wpt/metadata/css/css-fonts/idlharness.html.ini
+++ b/tests/wpt/metadata/css/css-fonts/idlharness.html.ini
@@ -116,3 +116,6 @@
   [CSSRule interface: cssRule must inherit property "FONT_FEATURE_VALUES_RULE" with the proper type]
     expected: FAIL
 
+  [CSSFontFeatureValuesMap interface: operation set(CSSOMString, (unsigned long or sequence<unsigned long>))]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-text-decor/text-decoration-skip-ink-005.html.ini b/tests/wpt/metadata/css/css-text-decor/text-decoration-skip-ink-005.html.ini
new file mode 100644
index 00000000000..9cedd2f8ed3
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text-decor/text-decoration-skip-ink-005.html.ini
@@ -0,0 +1,2 @@
+[text-decoration-skip-ink-005.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text-decor/text-decoration-skip-ink.html.ini b/tests/wpt/metadata/css/css-text-decor/text-decoration-skip-ink.html.ini
index 33a3b8b189b..512ec173754 100644
--- a/tests/wpt/metadata/css/css-text-decor/text-decoration-skip-ink.html.ini
+++ b/tests/wpt/metadata/css/css-text-decor/text-decoration-skip-ink.html.ini
@@ -5,3 +5,6 @@
   [Property text-decoration-skip-ink must support values auto and none.]
     expected: FAIL
 
+  [Property text-decoration-skip-ink must support values auto, none and all.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini b/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
index f8e7e539aae..4a1e8110f6f 100644
--- a/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
+++ b/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
@@ -2,6 +2,3 @@
   [Hit test intersecting scaled box]
     expected: FAIL
 
-  [Hit test within unscaled box]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini b/tests/wpt/metadata/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini
index e35a452a186..70a00a101f6 100644
--- a/tests/wpt/metadata/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini
+++ b/tests/wpt/metadata/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini
@@ -1,2 +1,2 @@
 [no-transition-from-ua-to-blocking-stylesheet.html]
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-values/minmax-number-computed.html.ini b/tests/wpt/metadata/css/css-values/minmax-number-computed.html.ini
index 7293d0a802a..632a2867a95 100644
--- a/tests/wpt/metadata/css/css-values/minmax-number-computed.html.ini
+++ b/tests/wpt/metadata/css/css-values/minmax-number-computed.html.ini
@@ -83,3 +83,9 @@
   [Property opacity value 'calc(max(0.1, 0.2) * 2)']
     expected: FAIL
 
+  [Property opacity value 'max(0, 0.5)']
+    expected: FAIL
+
+  [Property opacity value 'min(0, 0.5)']
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini b/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
new file mode 100644
index 00000000000..4c79907309b
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
@@ -0,0 +1,4 @@
+[CaretPosition-001.html]
+  [Element at (400, 100)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/MediaQueryList-addListener-removeListener.html.ini b/tests/wpt/metadata/css/cssom-view/MediaQueryList-addListener-removeListener.html.ini
index 628b1fab770..c884dc82eab 100644
--- a/tests/wpt/metadata/css/cssom-view/MediaQueryList-addListener-removeListener.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/MediaQueryList-addListener-removeListener.html.ini
@@ -2,3 +2,6 @@
   [listeners are called when <iframe> is resized]
     expected: FAIL
 
+  [listeners are called correct number of times]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini
index 6ef8bb1049f..171592fc08f 100644
--- a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini
@@ -2,6 +2,3 @@
   [elementsFromPoint on the root document for points in iframe elements]
     expected: FAIL
 
-  [elementsFromPoint on inner documents]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
deleted file mode 100644
index e181af5397f..00000000000
--- a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[elementsFromPoint-invalid-cases.html]
-  [The root element is the last element returned for otherwise empty queries within the viewport]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/cssom-view/idlharness.html.ini b/tests/wpt/metadata/css/cssom-view/idlharness.html.ini
index e62f2ff3e12..64b8ac50926 100644
--- a/tests/wpt/metadata/css/cssom-view/idlharness.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/idlharness.html.ini
@@ -286,3 +286,193 @@
 
   [Partial dictionary MouseEventInit: member names are unique]
     expected: FAIL
+
+  [Element interface: calling scrollIntoView(optional (boolean or ScrollIntoViewOptions)) on document.createElement("img") with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Element interface: document.createElement("img") must inherit property "convertQuadFromNode(DOMQuadInit, GeometryNode, optional ConvertCoordinateOptions)" with the proper type]
+    expected: FAIL
+
+  [Text interface: document.createTextNode("x") must inherit property "convertQuadFromNode(DOMQuadInit, GeometryNode, optional ConvertCoordinateOptions)" with the proper type]
+    expected: FAIL
+
+  [CSSPseudoElement interface: operation convertPointFromNode(DOMPointInit, GeometryNode, optional ConvertCoordinateOptions)]
+    expected: FAIL
+
+  [Element interface: document.createElementNS("x", "y") must inherit property "scrollIntoView(optional (boolean or ScrollIntoViewOptions))" with the proper type]
+    expected: FAIL
+
+  [Element interface: document.createElement("img") must inherit property "getBoxQuads(optional BoxQuadOptions)" with the proper type]
+    expected: FAIL
+
+  [CSSPseudoElement interface: operation convertRectFromNode(DOMRectReadOnly, GeometryNode, optional ConvertCoordinateOptions)]
+    expected: FAIL
+
+  [Document interface: operation getBoxQuads(optional BoxQuadOptions)]
+    expected: FAIL
+
+  [Element interface: calling getBoxQuads(optional BoxQuadOptions) on document.createElement("img") with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Text interface: operation convertRectFromNode(DOMRectReadOnly, GeometryNode, optional ConvertCoordinateOptions)]
+    expected: FAIL
+
+  [Element interface: calling getBoxQuads(optional BoxQuadOptions) on document.createElementNS("x", "y") with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Document interface: calling getBoxQuads(optional BoxQuadOptions) on document with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Document interface: calling convertPointFromNode(DOMPointInit, GeometryNode, optional ConvertCoordinateOptions) on document with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Document interface: operation convertPointFromNode(DOMPointInit, GeometryNode, optional ConvertCoordinateOptions)]
+    expected: FAIL
+
+  [Document interface: document must inherit property "convertQuadFromNode(DOMQuadInit, GeometryNode, optional ConvertCoordinateOptions)" with the proper type]
+    expected: FAIL
+
+  [Element interface: operation convertPointFromNode(DOMPointInit, GeometryNode, optional ConvertCoordinateOptions)]
+    expected: FAIL
+
+  [Document interface: operation convertRectFromNode(DOMRectReadOnly, GeometryNode, optional ConvertCoordinateOptions)]
+    expected: FAIL
+
+  [Element interface: calling convertPointFromNode(DOMPointInit, GeometryNode, optional ConvertCoordinateOptions) on document.createElement("img") with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CSSPseudoElement interface: operation convertQuadFromNode(DOMQuadInit, GeometryNode, optional ConvertCoordinateOptions)]
+    expected: FAIL
+
+  [Element interface: calling getBoxQuads(optional BoxQuadOptions) on document.createElement("div") with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Element interface: document.createElement("img") must inherit property "convertRectFromNode(DOMRectReadOnly, GeometryNode, optional ConvertCoordinateOptions)" with the proper type]
+    expected: FAIL
+
+  [Element interface: calling convertQuadFromNode(DOMQuadInit, GeometryNode, optional ConvertCoordinateOptions) on document.createElement("div") with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Element interface: calling convertRectFromNode(DOMRectReadOnly, GeometryNode, optional ConvertCoordinateOptions) on document.createElementNS("x", "y") with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Element interface: calling convertQuadFromNode(DOMQuadInit, GeometryNode, optional ConvertCoordinateOptions) on document.createElementNS("x", "y") with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Text interface: document.createTextNode("x") must inherit property "convertPointFromNode(DOMPointInit, GeometryNode, optional ConvertCoordinateOptions)" with the proper type]
+    expected: FAIL
+
+  [Element interface: calling convertRectFromNode(DOMRectReadOnly, GeometryNode, optional ConvertCoordinateOptions) on document.createElement("div") with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Document interface: calling convertRectFromNode(DOMRectReadOnly, GeometryNode, optional ConvertCoordinateOptions) on document with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Element interface: calling convertQuadFromNode(DOMQuadInit, GeometryNode, optional ConvertCoordinateOptions) on document.createElement("img") with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Element interface: operation getBoxQuads(optional BoxQuadOptions)]
+    expected: FAIL
+
+  [Element interface: document.createElement("div") must inherit property "convertQuadFromNode(DOMQuadInit, GeometryNode, optional ConvertCoordinateOptions)" with the proper type]
+    expected: FAIL
+
+  [Element interface: operation convertRectFromNode(DOMRectReadOnly, GeometryNode, optional ConvertCoordinateOptions)]
+    expected: FAIL
+
+  [Element interface: document.createElementNS("x", "y") must inherit property "convertQuadFromNode(DOMQuadInit, GeometryNode, optional ConvertCoordinateOptions)" with the proper type]
+    expected: FAIL
+
+  [Element interface: document.createElementNS("x", "y") must inherit property "convertPointFromNode(DOMPointInit, GeometryNode, optional ConvertCoordinateOptions)" with the proper type]
+    expected: FAIL
+
+  [Document interface: operation convertQuadFromNode(DOMQuadInit, GeometryNode, optional ConvertCoordinateOptions)]
+    expected: FAIL
+
+  [Text interface: calling convertRectFromNode(DOMRectReadOnly, GeometryNode, optional ConvertCoordinateOptions) on document.createTextNode("x") with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Element interface: document.createElement("div") must inherit property "convertPointFromNode(DOMPointInit, GeometryNode, optional ConvertCoordinateOptions)" with the proper type]
+    expected: FAIL
+
+  [Text interface: calling convertPointFromNode(DOMPointInit, GeometryNode, optional ConvertCoordinateOptions) on document.createTextNode("x") with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Element interface: document.createElementNS("x", "y") must inherit property "getBoxQuads(optional BoxQuadOptions)" with the proper type]
+    expected: FAIL
+
+  [Text interface: document.createTextNode("x") must inherit property "convertRectFromNode(DOMRectReadOnly, GeometryNode, optional ConvertCoordinateOptions)" with the proper type]
+    expected: FAIL
+
+  [Text interface: operation getBoxQuads(optional BoxQuadOptions)]
+    expected: FAIL
+
+  [Document interface: document must inherit property "convertRectFromNode(DOMRectReadOnly, GeometryNode, optional ConvertCoordinateOptions)" with the proper type]
+    expected: FAIL
+
+  [Element interface: calling convertRectFromNode(DOMRectReadOnly, GeometryNode, optional ConvertCoordinateOptions) on document.createElement("img") with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Text interface: operation convertPointFromNode(DOMPointInit, GeometryNode, optional ConvertCoordinateOptions)]
+    expected: FAIL
+
+  [Text interface: calling convertQuadFromNode(DOMQuadInit, GeometryNode, optional ConvertCoordinateOptions) on document.createTextNode("x") with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Text interface: calling getBoxQuads(optional BoxQuadOptions) on document.createTextNode("x") with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Element interface: calling scrollIntoView(optional (boolean or ScrollIntoViewOptions)) on document.createElement("div") with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Element interface: document.createElement("img") must inherit property "scrollIntoView(optional (boolean or ScrollIntoViewOptions))" with the proper type]
+    expected: FAIL
+
+  [Element interface: operation scrollIntoView(optional (boolean or ScrollIntoViewOptions))]
+    expected: FAIL
+
+  [Document interface: document must inherit property "convertPointFromNode(DOMPointInit, GeometryNode, optional ConvertCoordinateOptions)" with the proper type]
+    expected: FAIL
+
+  [Document interface: calling convertQuadFromNode(DOMQuadInit, GeometryNode, optional ConvertCoordinateOptions) on document with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Text interface: operation convertQuadFromNode(DOMQuadInit, GeometryNode, optional ConvertCoordinateOptions)]
+    expected: FAIL
+
+  [CSSPseudoElement interface: operation getBoxQuads(optional BoxQuadOptions)]
+    expected: FAIL
+
+  [Element interface: calling scrollIntoView(optional (boolean or ScrollIntoViewOptions)) on document.createElementNS("x", "y") with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Element interface: document.createElement("div") must inherit property "scrollIntoView(optional (boolean or ScrollIntoViewOptions))" with the proper type]
+    expected: FAIL
+
+  [Element interface: document.createElementNS("x", "y") must inherit property "convertRectFromNode(DOMRectReadOnly, GeometryNode, optional ConvertCoordinateOptions)" with the proper type]
+    expected: FAIL
+
+  [Element interface: document.createElement("div") must inherit property "getBoxQuads(optional BoxQuadOptions)" with the proper type]
+    expected: FAIL
+
+  [Element interface: calling convertPointFromNode(DOMPointInit, GeometryNode, optional ConvertCoordinateOptions) on document.createElementNS("x", "y") with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Document interface: document must inherit property "getBoxQuads(optional BoxQuadOptions)" with the proper type]
+    expected: FAIL
+
+  [Element interface: calling convertPointFromNode(DOMPointInit, GeometryNode, optional ConvertCoordinateOptions) on document.createElement("div") with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Element interface: document.createElement("img") must inherit property "convertPointFromNode(DOMPointInit, GeometryNode, optional ConvertCoordinateOptions)" with the proper type]
+    expected: FAIL
+
+  [Element interface: operation convertQuadFromNode(DOMQuadInit, GeometryNode, optional ConvertCoordinateOptions)]
+    expected: FAIL
+
+  [Element interface: document.createElement("div") must inherit property "convertRectFromNode(DOMRectReadOnly, GeometryNode, optional ConvertCoordinateOptions)" with the proper type]
+    expected: FAIL
+
+  [Text interface: document.createTextNode("x") must inherit property "getBoxQuads(optional BoxQuadOptions)" with the proper type]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom/idlharness.html.ini b/tests/wpt/metadata/css/cssom/idlharness.html.ini
index e872a40f5ef..4e86fdd41bf 100644
--- a/tests/wpt/metadata/css/cssom/idlharness.html.ini
+++ b/tests/wpt/metadata/css/cssom/idlharness.html.ini
@@ -488,3 +488,48 @@
   [CSSStyleDeclaration interface: sheet.cssRules[2\].cssRules[0\].style must inherit property "item(unsigned long)" with the proper type]
     expected: FAIL
 
+  [CSSStyleDeclaration interface: sheet.cssRules[4\].style must inherit property "setProperty(CSSOMString, CSSOMString, optional CSSOMString)" with the proper type]
+    expected: FAIL
+
+  [CSSStyleDeclaration interface: calling setProperty(CSSOMString, CSSOMString, optional CSSOMString) on sheet.cssRules[2\].style with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CSSStyleDeclaration interface: sheet.cssRules[2\].cssRules[0\].style must inherit property "setProperty(CSSOMString, CSSOMString, optional CSSOMString)" with the proper type]
+    expected: FAIL
+
+  [CSSStyleDeclaration interface: sheet.cssRules[2\].style must inherit property "setProperty(CSSOMString, CSSOMString, optional CSSOMString)" with the proper type]
+    expected: FAIL
+
+  [CSSStyleDeclaration interface: svg_element.style must inherit property "setProperty(CSSOMString, CSSOMString, optional CSSOMString)" with the proper type]
+    expected: FAIL
+
+  [CSSStyleSheet interface: calling addRule(optional DOMString, optional DOMString, optional unsigned long) on sheet with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CSSStyleSheet interface: operation addRule(optional DOMString, optional DOMString, optional unsigned long)]
+    expected: FAIL
+
+  [CSSGroupingRule interface: operation insertRule(CSSOMString, optional unsigned long)]
+    expected: FAIL
+
+  [CSSStyleSheet interface: sheet must inherit property "addRule(optional DOMString, optional DOMString, optional unsigned long)" with the proper type]
+    expected: FAIL
+
+  [CSSStyleSheet interface: operation removeRule(optional unsigned long)]
+    expected: FAIL
+
+  [CSSStyleSheet interface: sheet must inherit property "removeRule(optional unsigned long)" with the proper type]
+    expected: FAIL
+
+  [CSSStyleDeclaration interface: calling setProperty(CSSOMString, CSSOMString, optional CSSOMString) on sheet.cssRules[2\].cssRules[0\].style with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CSSStyleDeclaration interface: calling setProperty(CSSOMString, CSSOMString, optional CSSOMString) on sheet.cssRules[4\].style with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CSSStyleSheet interface: calling removeRule(optional unsigned long) on sheet with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CSSStyleDeclaration interface: calling setProperty(CSSOMString, CSSOMString, optional CSSOMString) on svg_element.style with too few arguments must throw TypeError]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/geometry/interfaces.html.ini b/tests/wpt/metadata/css/geometry/interfaces.html.ini
index 90a08304978..22f0e9b1d5b 100644
--- a/tests/wpt/metadata/css/geometry/interfaces.html.ini
+++ b/tests/wpt/metadata/css/geometry/interfaces.html.ini
@@ -311,3 +311,34 @@
 
   [Geometry APIs interface IDL tests]
     expected: FAIL
+
+  [DOMRectReadOnly interface: operation fromRect(optional DOMRectInit)]
+    expected: FAIL
+
+  [DOMPointReadOnly interface: calling matrixTransform(optional DOMMatrixInit) on new DOMPoint() with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [DOMPointReadOnly interface: operation matrixTransform(optional DOMMatrixInit)]
+    expected: FAIL
+
+  [DOMRect interface: operation fromRect(optional DOMRectInit)]
+    expected: FAIL
+
+  [DOMPointReadOnly interface: new DOMPoint() must inherit property "matrixTransform(optional DOMMatrixInit)" with the proper type]
+    expected: FAIL
+
+  [DOMRectReadOnly interface: calling fromRect(optional DOMRectInit) on new DOMRect() with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [DOMRect interface: calling fromRect(optional DOMRectInit) on new DOMRect() with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [DOMRectReadOnly interface: calling fromRect(optional DOMRectInit) on new DOMRectReadOnly() with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [DOMPointReadOnly interface: new DOMPointReadOnly() must inherit property "matrixTransform(optional DOMMatrixInit)" with the proper type]
+    expected: FAIL
+
+  [DOMPointReadOnly interface: calling matrixTransform(optional DOMMatrixInit) on new DOMPointReadOnly() with too few arguments must throw TypeError]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/geometry/interfaces.worker.js.ini b/tests/wpt/metadata/css/geometry/interfaces.worker.js.ini
index 5ca33a54aab..6b6fbaa3954 100644
--- a/tests/wpt/metadata/css/geometry/interfaces.worker.js.ini
+++ b/tests/wpt/metadata/css/geometry/interfaces.worker.js.ini
@@ -34,3 +34,34 @@
 
   [interfaces]
     expected: FAIL
+
+  [DOMRectReadOnly interface: operation fromRect(optional DOMRectInit)]
+    expected: FAIL
+
+  [DOMPointReadOnly interface: calling matrixTransform(optional DOMMatrixInit) on new DOMPoint() with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [DOMPointReadOnly interface: operation matrixTransform(optional DOMMatrixInit)]
+    expected: FAIL
+
+  [DOMRect interface: operation fromRect(optional DOMRectInit)]
+    expected: FAIL
+
+  [DOMPointReadOnly interface: new DOMPoint() must inherit property "matrixTransform(optional DOMMatrixInit)" with the proper type]
+    expected: FAIL
+
+  [DOMRectReadOnly interface: calling fromRect(optional DOMRectInit) on new DOMRect() with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [DOMRect interface: calling fromRect(optional DOMRectInit) on new DOMRect() with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [DOMRectReadOnly interface: calling fromRect(optional DOMRectInit) on new DOMRectReadOnly() with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [DOMPointReadOnly interface: new DOMPointReadOnly() must inherit property "matrixTransform(optional DOMMatrixInit)" with the proper type]
+    expected: FAIL
+
+  [DOMPointReadOnly interface: calling matrixTransform(optional DOMMatrixInit) on new DOMPointReadOnly() with too few arguments must throw TypeError]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/dom/idlharness.any.js.ini b/tests/wpt/metadata/dom/idlharness.any.js.ini
index f57baac9c25..24e4bf05ff2 100644
--- a/tests/wpt/metadata/dom/idlharness.any.js.ini
+++ b/tests/wpt/metadata/dom/idlharness.any.js.ini
@@ -110,6 +110,21 @@
   [AbortController must be primary interface of new AbortController()]
     expected: FAIL
 
+  [EventTarget interface: new AbortController().signal must inherit property "removeEventListener(DOMString, EventListener?, optional (EventListenerOptions or boolean))" with the proper type]
+    expected: FAIL
+
+  [EventTarget interface: calling removeEventListener(DOMString, EventListener?, optional (EventListenerOptions or boolean)) on new AbortController().signal with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CustomEvent interface: operation initCustomEvent(DOMString, optional boolean, optional boolean, optional any)]
+    expected: FAIL
+
+  [EventTarget interface: new AbortController().signal must inherit property "addEventListener(DOMString, EventListener?, optional (AddEventListenerOptions or boolean))" with the proper type]
+    expected: FAIL
+
+  [EventTarget interface: calling addEventListener(DOMString, EventListener?, optional (AddEventListenerOptions or boolean)) on new AbortController().signal with too few arguments must throw TypeError]
+    expected: FAIL
+
 
 [idlharness.any.sharedworker.html]
   expected: ERROR
diff --git a/tests/wpt/metadata/dom/idlharness.window.js.ini b/tests/wpt/metadata/dom/idlharness.window.js.ini
index d2543ab080d..09a1b5163b7 100644
--- a/tests/wpt/metadata/dom/idlharness.window.js.ini
+++ b/tests/wpt/metadata/dom/idlharness.window.js.ini
@@ -602,3 +602,122 @@
   [ShadowRoot interface: attribute onslotchange]
     expected: FAIL
 
+  [XPathExpression interface: document.createExpression("//*") must inherit property "evaluate(Node, optional unsigned short, optional XPathResult?)" with the proper type]
+    expected: FAIL
+
+  [Element interface: operation replaceWith((Node or DOMString)...)]
+    expected: FAIL
+
+  [Document interface: operation prepend((Node or DOMString)...)]
+    expected: FAIL
+
+  [EventTarget interface: calling removeEventListener(DOMString, EventListener?, optional (EventListenerOptions or boolean)) on new AbortController().signal with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [EventTarget interface: new AbortController().signal must inherit property "addEventListener(DOMString, EventListener?, optional (AddEventListenerOptions or boolean))" with the proper type]
+    expected: FAIL
+
+  [EventTarget interface: new AbortController().signal must inherit property "removeEventListener(DOMString, EventListener?, optional (EventListenerOptions or boolean))" with the proper type]
+    expected: FAIL
+
+  [XPathEvaluator interface: operation createExpression(DOMString, optional XPathNSResolver?)]
+    expected: FAIL
+
+  [Element interface: operation prepend((Node or DOMString)...)]
+    expected: FAIL
+
+  [CharacterData interface: operation before((Node or DOMString)...)]
+    expected: FAIL
+
+  [XPathEvaluator interface: operation evaluate(DOMString, Node, optional XPathNSResolver?, optional unsigned short, optional XPathResult?)]
+    expected: FAIL
+
+  [Element interface: operation after((Node or DOMString)...)]
+    expected: FAIL
+
+  [CustomEvent interface: operation initCustomEvent(DOMString, optional boolean, optional boolean, optional any)]
+    expected: FAIL
+
+  [Document interface: new Document() must inherit property "evaluate(DOMString, Node, optional XPathNSResolver?, optional unsigned short, optional XPathResult?)" with the proper type]
+    expected: FAIL
+
+  [Document interface: xmlDoc must inherit property "evaluate(DOMString, Node, optional XPathNSResolver?, optional unsigned short, optional XPathResult?)" with the proper type]
+    expected: FAIL
+
+  [XPathExpression interface: operation evaluate(Node, optional unsigned short, optional XPathResult?)]
+    expected: FAIL
+
+  [Document interface: calling evaluate(DOMString, Node, optional XPathNSResolver?, optional unsigned short, optional XPathResult?) on new Document() with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CharacterData interface: operation replaceWith((Node or DOMString)...)]
+    expected: FAIL
+
+  [Document interface: xmlDoc must inherit property "createExpression(DOMString, optional XPathNSResolver?)" with the proper type]
+    expected: FAIL
+
+  [DocumentType interface: operation replaceWith((Node or DOMString)...)]
+    expected: FAIL
+
+  [XPathEvaluator interface: calling createExpression(DOMString, optional XPathNSResolver?) on new XPathEvaluator() with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [DocumentType interface: operation before((Node or DOMString)...)]
+    expected: FAIL
+
+  [EventTarget interface: calling addEventListener(DOMString, EventListener?, optional (AddEventListenerOptions or boolean)) on new AbortController().signal with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Document interface: calling createExpression(DOMString, optional XPathNSResolver?) on xmlDoc with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [XPathEvaluator interface: new XPathEvaluator() must inherit property "evaluate(DOMString, Node, optional XPathNSResolver?, optional unsigned short, optional XPathResult?)" with the proper type]
+    expected: FAIL
+
+  [XPathEvaluator interface: calling evaluate(DOMString, Node, optional XPathNSResolver?, optional unsigned short, optional XPathResult?) on new XPathEvaluator() with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Document interface: calling evaluate(DOMString, Node, optional XPathNSResolver?, optional unsigned short, optional XPathResult?) on xmlDoc with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Document interface: operation evaluate(DOMString, Node, optional XPathNSResolver?, optional unsigned short, optional XPathResult?)]
+    expected: FAIL
+
+  [Document interface: operation createExpression(DOMString, optional XPathNSResolver?)]
+    expected: FAIL
+
+  [Document interface: new Document() must inherit property "createExpression(DOMString, optional XPathNSResolver?)" with the proper type]
+    expected: FAIL
+
+  [Document interface: calling createExpression(DOMString, optional XPathNSResolver?) on new Document() with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [XPathEvaluator interface: new XPathEvaluator() must inherit property "createExpression(DOMString, optional XPathNSResolver?)" with the proper type]
+    expected: FAIL
+
+  [CharacterData interface: operation after((Node or DOMString)...)]
+    expected: FAIL
+
+  [DocumentFragment interface: operation prepend((Node or DOMString)...)]
+    expected: FAIL
+
+  [XPathExpression interface: calling evaluate(Node, optional unsigned short, optional XPathResult?) on document.createExpression("//*") with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Document interface: operation append((Node or DOMString)...)]
+    expected: FAIL
+
+  [DocumentType interface: operation after((Node or DOMString)...)]
+    expected: FAIL
+
+  [DocumentFragment interface: operation append((Node or DOMString)...)]
+    expected: FAIL
+
+  [Element interface: operation append((Node or DOMString)...)]
+    expected: FAIL
+
+  [Element interface: operation before((Node or DOMString)...)]
+    expected: FAIL
+
+
+[idlharness.window.html?include=Node]
diff --git a/tests/wpt/metadata/dom/nodes/aria-attribute-reflection.tentative.html.ini b/tests/wpt/metadata/dom/nodes/aria-attribute-reflection.tentative.html.ini
index dcba3565fbe..455e86eb4dc 100644
--- a/tests/wpt/metadata/dom/nodes/aria-attribute-reflection.tentative.html.ini
+++ b/tests/wpt/metadata/dom/nodes/aria-attribute-reflection.tentative.html.ini
@@ -110,3 +110,6 @@
   [aria-multiline attribute reflects.]
     expected: FAIL
 
+  [aria-description attribute reflects.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/api/cors/data-url-shared-worker.html.ini b/tests/wpt/metadata/fetch/api/cors/data-url-shared-worker.html.ini
new file mode 100644
index 00000000000..8751145ba5f
--- /dev/null
+++ b/tests/wpt/metadata/fetch/api/cors/data-url-shared-worker.html.ini
@@ -0,0 +1,10 @@
+[data-url-shared-worker.html]
+  [fetching "top.txt" without ACAO should be rejected.]
+    expected: FAIL
+
+  [fetching data url script should be allowed.]
+    expected: FAIL
+
+  [fetching "top.txt" with CORS allowing null origin should be allowed.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/api/cors/data-url-worker.html.ini b/tests/wpt/metadata/fetch/api/cors/data-url-worker.html.ini
new file mode 100644
index 00000000000..8ae852672bc
--- /dev/null
+++ b/tests/wpt/metadata/fetch/api/cors/data-url-worker.html.ini
@@ -0,0 +1,4 @@
+[data-url-worker.html]
+  [fetching "top.txt" without ACAO should be rejected.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/api/idlharness.any.js.ini b/tests/wpt/metadata/fetch/api/idlharness.any.js.ini
index 7e1ca25d680..81849d034d6 100644
--- a/tests/wpt/metadata/fetch/api/idlharness.any.js.ini
+++ b/tests/wpt/metadata/fetch/api/idlharness.any.js.ini
@@ -83,6 +83,12 @@
   [Request interface: attribute body]
     expected: FAIL
 
+  [Window interface: calling fetch(RequestInfo, optional RequestInit) on window with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Window interface: operation fetch(RequestInfo, optional RequestInit)]
+    expected: FAIL
+
 
 [idlharness.any.worker.html]
   [Response interface: new Response() must inherit property "body" with the proper type]
@@ -163,6 +169,12 @@
   [Request interface: attribute body]
     expected: FAIL
 
+  [WorkerGlobalScope interface: calling fetch(RequestInfo, optional RequestInit) on self with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [WorkerGlobalScope interface: operation fetch(RequestInfo, optional RequestInit)]
+    expected: FAIL
+
 
 [idlharness.any.sharedworker.html]
   expected: ERROR
diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index aff2b4d55bf..49e6cbd5e43 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -312,21 +312,18 @@
   [fetch(): separate response Content-Type: text/plain ]
     expected: NOTRUN
 
-  [<iframe>: separate response Content-Type: text/plain */*]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html */*]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
+  [<iframe>: combined response Content-Type: */* text/html]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;" text/plain]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
index 30e1b851fd4..64096aee724 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,3 +11,9 @@
   [X-Content-Type-Options%3A%20nosniff%2C%2C%40%23%24%23%25%25%26%5E%26%5E*()()11!]
     expected: FAIL
 
+  [X-Content-Type-Options%3A%20%40%23%24%23%25%25%26%5E%26%5E*()()11!%2Cnosniff]
+    expected: FAIL
+
+  [X-Content-Type-Options%3A%20%2Cnosniff]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/security/embedded-credentials.tentative.sub.html.ini b/tests/wpt/metadata/fetch/security/embedded-credentials.tentative.sub.html.ini
index 624be5731eb..a3a600c5846 100644
--- a/tests/wpt/metadata/fetch/security/embedded-credentials.tentative.sub.html.ini
+++ b/tests/wpt/metadata/fetch/security/embedded-credentials.tentative.sub.html.ini
@@ -4,10 +4,11 @@
     expected: FAIL
 
   [Embedded credentials are treated as network errors in frames.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Embedded credentials are treated as network errors in new windows.]
     expected: FAIL
 
   [Embedded credentials matching the top-level are treated as network errors for cross-origin URLs.]
     expected: FAIL
+
diff --git a/tests/wpt/metadata/fullscreen/idlharness.window.js.ini b/tests/wpt/metadata/fullscreen/idlharness.window.js.ini
index 2771b31af7b..77acf9b97d4 100644
--- a/tests/wpt/metadata/fullscreen/idlharness.window.js.ini
+++ b/tests/wpt/metadata/fullscreen/idlharness.window.js.ini
@@ -35,3 +35,6 @@
   [Element interface: operation requestFullscreen(FullscreenOptions)]
     expected: FAIL
 
+  [Element interface: operation requestFullscreen(optional FullscreenOptions)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
deleted file mode 100644
index 87b07c3e670..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_1.html]
-  [Multiple history traversals from the same task]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
new file mode 100644
index 00000000000..385376c7321
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_4.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
new file mode 100644
index 00000000000..dc2e45516de
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_5.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/origin/origin-of-data-document.html.ini b/tests/wpt/metadata/html/browsers/origin/origin-of-data-document.html.ini
new file mode 100644
index 00000000000..b80c419654d
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/origin-of-data-document.html.ini
@@ -0,0 +1,4 @@
+[origin-of-data-document.html]
+  [The origin of a 'data:' document in a frame is opaque.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_access_details.sub.html.ini b/tests/wpt/metadata/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_access_details.sub.html.ini
index 8da94f60fc5..12adf20e2af 100644
--- a/tests/wpt/metadata/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_access_details.sub.html.ini
+++ b/tests/wpt/metadata/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_access_details.sub.html.ini
@@ -1,38 +1,37 @@
 [document_domain_access_details.sub.html]
-  expected: TIMEOUT
   [Access allowed if same-origin with no 'document.domain' modification. (Sanity check)]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Access is revoked to Window object when we stop being same effective script origin due to document.domain.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Access allowed if different-origin but both set document.domain to parent domain.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Access is not revoked to random object when we stop being same effective script origin due to document.domain.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Access not allowed if different-origin with no 'document.domain' modification. (Sanity check)]
-    expected: NOTRUN
+    expected: FAIL
 
   [Access disallowed again if same-origin, both set document-domain to existing value, then one sets to parent.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Access is revoked to Location object when we stop being same effective script origin due to document.domain.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Access allowed if same-origin and both set document.domain to existing value.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Access is not revoked to Document object when we stop being same effective script origin due to document.domain.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Access disallowed if same-origin but only one sets document.domain.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Access evolves correctly for cross-origin objects when we join up via document.domain and then diverge again.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Access evolves correctly for non-cross-origin objects when we join up via document.domain and then diverge again.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_feature_policy.tentative.sub.html.ini b/tests/wpt/metadata/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_feature_policy.tentative.sub.html.ini
index 515c522cda5..4713cc6c96d 100644
--- a/tests/wpt/metadata/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_feature_policy.tentative.sub.html.ini
+++ b/tests/wpt/metadata/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_feature_policy.tentative.sub.html.ini
@@ -1,7 +1,11 @@
 [document_domain_feature_policy.tentative.sub.html]
+  expected: TIMEOUT
   [Feature policy "document-domain" can be disabled in cross-origin iframes using "allow" attribute.]
     expected: FAIL
 
   [Feature policy "document-domain" can be disabled in same-origin iframes using "allow" attribute.]
     expected: FAIL
 
+  [Default "document-domain" feature policy ["*"\] allows same-origin iframes.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/html/browsers/sandboxing/sandbox-disallow-same-origin.html.ini b/tests/wpt/metadata/html/browsers/sandboxing/sandbox-disallow-same-origin.html.ini
new file mode 100644
index 00000000000..90ccb850b41
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/sandboxing/sandbox-disallow-same-origin.html.ini
@@ -0,0 +1,4 @@
+[sandbox-disallow-same-origin.html]
+  [Access to sandbox iframe is disallowed]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/dom/idlharness.https.html.ini b/tests/wpt/metadata/html/dom/idlharness.https.html.ini
index 371d4043a67..85cd8fec619 100644
--- a/tests/wpt/metadata/html/dom/idlharness.https.html.ini
+++ b/tests/wpt/metadata/html/dom/idlharness.https.html.ini
@@ -1349,6 +1349,99 @@
   [SVGElement interface: attribute onwebkitanimationiteration]
     expected: FAIL
 
+  [OffscreenCanvasRenderingContext2D interface: operation fill(optional CanvasFillRule)]
+    expected: FAIL
+
+  [DataTransfer interface: operation clearData(optional DOMString)]
+    expected: FAIL
+
+  [OffscreenCanvas interface: operation convertToBlob(optional ImageEncodeOptions)]
+    expected: FAIL
+
+  [ElementInternals interface: operation setValidity(ValidityStateFlags, optional DOMString, optional HTMLElement)]
+    expected: FAIL
+
+  [OffscreenCanvasRenderingContext2D interface: operation setLineDash(sequence<unrestricted double>)]
+    expected: FAIL
+
+  [CanvasRenderingContext2D interface: operation setLineDash(sequence<unrestricted double>)]
+    expected: FAIL
+
+  [OffscreenCanvas interface: operation getContext(OffscreenRenderingContextId, optional any)]
+    expected: FAIL
+
+  [CanvasRenderingContext2D interface: document.createElement("canvas").getContext("2d") must inherit property "strokeText(DOMString, unrestricted double, unrestricted double, optional unrestricted double)" with the proper type]
+    expected: FAIL
+
+  [CanvasRenderingContext2D interface: document.createElement("canvas").getContext("2d") must inherit property "setLineDash(sequence<unrestricted double>)" with the proper type]
+    expected: FAIL
+
+  [OffscreenCanvasRenderingContext2D interface: operation ellipse(unrestricted double, unrestricted double, unrestricted double, unrestricted double, unrestricted double, unrestricted double, unrestricted double, optional boolean)]
+    expected: FAIL
+
+  [OffscreenCanvasRenderingContext2D interface: operation clip(Path2D, optional CanvasFillRule)]
+    expected: FAIL
+
+  [CanvasPattern interface: operation setTransform(optional DOMMatrix2DInit)]
+    expected: FAIL
+
+  [Path2D interface: operation ellipse(unrestricted double, unrestricted double, unrestricted double, unrestricted double, unrestricted double, unrestricted double, unrestricted double, optional boolean)]
+    expected: FAIL
+
+  [Path2D interface: operation addPath(Path2D, optional DOMMatrix2DInit)]
+    expected: FAIL
+
+  [OffscreenCanvasRenderingContext2D interface: operation clip(optional CanvasFillRule)]
+    expected: FAIL
+
+  [OffscreenCanvasRenderingContext2D interface: operation fillText(DOMString, unrestricted double, unrestricted double, optional unrestricted double)]
+    expected: FAIL
+
+  [OffscreenCanvasRenderingContext2D interface: operation fill(Path2D, optional CanvasFillRule)]
+    expected: FAIL
+
+  [CanvasRenderingContext2D interface: operation strokeText(DOMString, unrestricted double, unrestricted double, optional unrestricted double)]
+    expected: FAIL
+
+  [Path2D interface: operation arc(unrestricted double, unrestricted double, unrestricted double, unrestricted double, unrestricted double, optional boolean)]
+    expected: FAIL
+
+  [DataTransferItem interface: operation getAsString(FunctionStringCallback?)]
+    expected: FAIL
+
+  [OffscreenCanvasRenderingContext2D interface: operation arc(unrestricted double, unrestricted double, unrestricted double, unrestricted double, unrestricted double, optional boolean)]
+    expected: FAIL
+
+  [ImageBitmapRenderingContext interface: operation transferFromImageBitmap(ImageBitmap?)]
+    expected: FAIL
+
+  [OffscreenCanvasRenderingContext2D interface: operation isPointInPath(unrestricted double, unrestricted double, optional CanvasFillRule)]
+    expected: FAIL
+
+  [SVGElement interface: operation focus(optional FocusOptions)]
+    expected: FAIL
+
+  [CanvasRenderingContext2D interface: calling setLineDash(sequence<unrestricted double>) on document.createElement("canvas").getContext("2d") with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [OffscreenCanvasRenderingContext2D interface: operation isPointInPath(Path2D, unrestricted double, unrestricted double, optional CanvasFillRule)]
+    expected: FAIL
+
+  [CanvasRenderingContext2D interface: operation setTransform(optional DOMMatrix2DInit)]
+    expected: FAIL
+
+  [OffscreenCanvasRenderingContext2D interface: operation strokeText(DOMString, unrestricted double, unrestricted double, optional unrestricted double)]
+    expected: FAIL
+
+  [CanvasRenderingContext2D interface: calling strokeText(DOMString, unrestricted double, unrestricted double, optional unrestricted double) on document.createElement("canvas").getContext("2d") with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [OffscreenCanvasRenderingContext2D interface: operation setTransform(optional DOMMatrix2DInit)]
+    expected: FAIL
+
+  [ElementInternals interface: operation setFormValue((File or USVString or FormData)?, optional (File or USVString or FormData)?)]
+    expected: FAIL
+
 
 [idlharness.https.html?include=(Document|Window)]
   [Document interface: documentWithHandlers must inherit property "queryCommandEnabled(DOMString)" with the proper type]
@@ -1774,6 +1867,45 @@
   [Window interface: window must inherit property "onwebkitanimationstart" with the proper type]
     expected: FAIL
 
+  [Window interface: calling createImageBitmap(ImageBitmapSource, long, long, long, long, optional ImageBitmapOptions) on window with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Window interface: operation createImageBitmap(ImageBitmapSource, optional ImageBitmapOptions)]
+    expected: FAIL
+
+  [Window interface: window must inherit property "createImageBitmap(ImageBitmapSource, optional ImageBitmapOptions)" with the proper type]
+    expected: FAIL
+
+  [Document interface: calling execCommand(DOMString, optional boolean, optional DOMString) on new Document() with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Document interface: documentWithHandlers must inherit property "execCommand(DOMString, optional boolean, optional DOMString)" with the proper type]
+    expected: FAIL
+
+  [Document interface: new Document() must inherit property "execCommand(DOMString, optional boolean, optional DOMString)" with the proper type]
+    expected: FAIL
+
+  [Window interface: window must inherit property "createImageBitmap(ImageBitmapSource, long, long, long, long, optional ImageBitmapOptions)" with the proper type]
+    expected: FAIL
+
+  [Document interface: calling execCommand(DOMString, optional boolean, optional DOMString) on iframe.contentDocument with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Document interface: operation execCommand(DOMString, optional boolean, optional DOMString)]
+    expected: FAIL
+
+  [Window interface: operation createImageBitmap(ImageBitmapSource, long, long, long, long, optional ImageBitmapOptions)]
+    expected: FAIL
+
+  [Window interface: calling createImageBitmap(ImageBitmapSource, optional ImageBitmapOptions) on window with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Document interface: iframe.contentDocument must inherit property "execCommand(DOMString, optional boolean, optional DOMString)" with the proper type]
+    expected: FAIL
+
+  [Document interface: calling execCommand(DOMString, optional boolean, optional DOMString) on documentWithHandlers with too few arguments must throw TypeError]
+    expected: FAIL
+
 
 [idlharness.https.html?include=HTML.*]
   [HTMLInputElement interface: calling setCustomValidity(DOMString) on createInput("hidden") with too few arguments must throw TypeError]
@@ -4409,3 +4541,49 @@
 
   [HTMLImageElement interface: document.createElement("img") must inherit property "loading" with the proper type]
     expected: FAIL
+
+  [HTMLFormElement interface: calling requestSubmit(optional HTMLElement?) on document.createElement("form") with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [HTMLSlotElement interface: calling assignedNodes(optional AssignedNodesOptions) on document.createElement("slot") with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [HTMLCanvasElement interface: operation toBlob(BlobCallback, optional DOMString, optional any)]
+    expected: FAIL
+
+  [HTMLSlotElement interface: document.createElement("slot") must inherit property "assignedElements(optional AssignedNodesOptions)" with the proper type]
+    expected: FAIL
+
+  [HTMLSlotElement interface: calling assignedElements(optional AssignedNodesOptions) on document.createElement("slot") with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [HTMLCanvasElement interface: calling toBlob(BlobCallback, optional DOMString, optional any) on document.createElement("canvas") with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [HTMLAllCollection interface: document.all must inherit property "item(optional DOMString)" with the proper type]
+    expected: FAIL
+
+  [HTMLFormElement interface: operation requestSubmit(optional HTMLElement?)]
+    expected: FAIL
+
+  [HTMLAllCollection interface: calling item(optional DOMString) on document.all with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [HTMLAllCollection interface: operation item(optional DOMString)]
+    expected: FAIL
+
+  [HTMLFormElement interface: document.createElement("form") must inherit property "requestSubmit(optional HTMLElement?)" with the proper type]
+    expected: FAIL
+
+  [HTMLCanvasElement interface: document.createElement("canvas") must inherit property "toBlob(BlobCallback, optional DOMString, optional any)" with the proper type]
+    expected: FAIL
+
+  [HTMLSlotElement interface: operation assignedElements(optional AssignedNodesOptions)]
+    expected: FAIL
+
+  [HTMLSlotElement interface: document.createElement("slot") must inherit property "assignedNodes(optional AssignedNodesOptions)" with the proper type]
+    expected: FAIL
+
+  [HTMLSlotElement interface: operation assignedNodes(optional AssignedNodesOptions)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/dom/idlharness.worker.js.ini b/tests/wpt/metadata/html/dom/idlharness.worker.js.ini
index 55715d00b01..2ee6b8974f7 100644
--- a/tests/wpt/metadata/html/dom/idlharness.worker.js.ini
+++ b/tests/wpt/metadata/html/dom/idlharness.worker.js.ini
@@ -83,9 +83,6 @@
   [WorkerGlobalScope interface: self must inherit property "ononline" with the proper type]
     expected: FAIL
 
-  [BroadcastChannel interface: operation close()]
-    expected: FAIL
-
   [DedicatedWorkerGlobalScope interface: calling requestAnimationFrame(FrameRequestCallback) on self with too few arguments must throw TypeError]
     expected: FAIL
 
@@ -128,9 +125,6 @@
   [OffscreenCanvasRenderingContext2D interface: operation bezierCurveTo(unrestricted double, unrestricted double, unrestricted double, unrestricted double, unrestricted double, unrestricted double)]
     expected: FAIL
 
-  [BroadcastChannel interface: existence and properties of interface prototype object's @@unscopables property]
-    expected: FAIL
-
   [OffscreenCanvas interface: existence and properties of interface prototype object]
     expected: FAIL
 
@@ -176,9 +170,6 @@
   [WorkerGlobalScope interface: operation createImageBitmap(ImageBitmapSource, ImageBitmapOptions)]
     expected: FAIL
 
-  [BroadcastChannel interface: attribute name]
-    expected: FAIL
-
   [Path2D interface: existence and properties of interface prototype object]
     expected: FAIL
 
@@ -257,9 +248,6 @@
   [OffscreenCanvas interface: attribute height]
     expected: FAIL
 
-  [BroadcastChannel interface: existence and properties of interface prototype object]
-    expected: FAIL
-
   [ImageBitmap interface object name]
     expected: FAIL
 
@@ -299,9 +287,6 @@
   [WorkerNavigator interface: self.navigator must inherit property "hardwareConcurrency" with the proper type]
     expected: FAIL
 
-  [BroadcastChannel interface: existence and properties of interface object]
-    expected: FAIL
-
   [ImageBitmapRenderingContext interface object name]
     expected: FAIL
 
@@ -392,9 +377,6 @@
   [OffscreenCanvasRenderingContext2D interface: operation fill(Path2D, CanvasFillRule)]
     expected: FAIL
 
-  [BroadcastChannel interface: attribute onmessage]
-    expected: FAIL
-
   [Path2D interface: existence and properties of interface prototype object's "constructor" property]
     expected: FAIL
 
@@ -422,9 +404,6 @@
   [OffscreenCanvasRenderingContext2D interface: operation isPointInStroke(Path2D, unrestricted double, unrestricted double)]
     expected: FAIL
 
-  [BroadcastChannel interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
   [OffscreenCanvasRenderingContext2D interface: attribute textAlign]
     expected: FAIL
 
@@ -437,9 +416,6 @@
   [OffscreenCanvasRenderingContext2D interface: operation arcTo(unrestricted double, unrestricted double, unrestricted double, unrestricted double, unrestricted double)]
     expected: FAIL
 
-  [BroadcastChannel interface: attribute onmessageerror]
-    expected: FAIL
-
   [OffscreenCanvasRenderingContext2D interface: operation closePath()]
     expected: FAIL
 
@@ -452,9 +428,6 @@
   [ImageBitmap interface: attribute width]
     expected: FAIL
 
-  [BroadcastChannel interface: operation postMessage(any)]
-    expected: FAIL
-
   [SharedWorker interface: attribute port]
     expected: FAIL
 
@@ -488,9 +461,6 @@
   [OffscreenCanvasRenderingContext2D interface: operation ellipse(unrestricted double, unrestricted double, unrestricted double, unrestricted double, unrestricted double, unrestricted double, unrestricted double, boolean)]
     expected: FAIL
 
-  [BroadcastChannel interface object name]
-    expected: FAIL
-
   [OffscreenCanvasRenderingContext2D interface: operation putImageData(ImageData, long, long)]
     expected: FAIL
 
@@ -539,9 +509,81 @@
   [OffscreenCanvas interface: operation convertToBlob(ImageEncodeOptions)]
     expected: FAIL
 
-  [BroadcastChannel interface object length]
-    expected: FAIL
-
   [OffscreenCanvasRenderingContext2D interface: operation clip(CanvasFillRule)]
     expected: FAIL
 
+  [OffscreenCanvasRenderingContext2D interface: operation fillText(DOMString, unrestricted double, unrestricted double, optional unrestricted double)]
+    expected: FAIL
+
+  [OffscreenCanvasRenderingContext2D interface: operation fill(optional CanvasFillRule)]
+    expected: FAIL
+
+  [WorkerGlobalScope interface: self must inherit property "createImageBitmap(ImageBitmapSource, long, long, long, long, optional ImageBitmapOptions)" with the proper type]
+    expected: FAIL
+
+  [OffscreenCanvasRenderingContext2D interface: operation isPointInPath(unrestricted double, unrestricted double, optional CanvasFillRule)]
+    expected: FAIL
+
+  [OffscreenCanvasRenderingContext2D interface: operation isPointInPath(Path2D, unrestricted double, unrestricted double, optional CanvasFillRule)]
+    expected: FAIL
+
+  [WorkerGlobalScope interface: calling createImageBitmap(ImageBitmapSource, optional ImageBitmapOptions) on self with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [OffscreenCanvasRenderingContext2D interface: operation fill(Path2D, optional CanvasFillRule)]
+    expected: FAIL
+
+  [OffscreenCanvas interface: operation convertToBlob(optional ImageEncodeOptions)]
+    expected: FAIL
+
+  [WorkerGlobalScope interface: operation createImageBitmap(ImageBitmapSource, long, long, long, long, optional ImageBitmapOptions)]
+    expected: FAIL
+
+  [OffscreenCanvasRenderingContext2D interface: operation clip(Path2D, optional CanvasFillRule)]
+    expected: FAIL
+
+  [OffscreenCanvas interface: operation getContext(OffscreenRenderingContextId, optional any)]
+    expected: FAIL
+
+  [Path2D interface: operation arc(unrestricted double, unrestricted double, unrestricted double, unrestricted double, unrestricted double, optional boolean)]
+    expected: FAIL
+
+  [OffscreenCanvasRenderingContext2D interface: operation strokeText(DOMString, unrestricted double, unrestricted double, optional unrestricted double)]
+    expected: FAIL
+
+  [CanvasPattern interface: operation setTransform(optional DOMMatrix2DInit)]
+    expected: FAIL
+
+  [OffscreenCanvasRenderingContext2D interface: operation setLineDash(sequence<unrestricted double>)]
+    expected: FAIL
+
+  [WorkerGlobalScope interface: calling createImageBitmap(ImageBitmapSource, long, long, long, long, optional ImageBitmapOptions) on self with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [OffscreenCanvasRenderingContext2D interface: operation setTransform(optional DOMMatrix2DInit)]
+    expected: FAIL
+
+  [Path2D interface: operation ellipse(unrestricted double, unrestricted double, unrestricted double, unrestricted double, unrestricted double, unrestricted double, unrestricted double, optional boolean)]
+    expected: FAIL
+
+  [OffscreenCanvasRenderingContext2D interface: operation arc(unrestricted double, unrestricted double, unrestricted double, unrestricted double, unrestricted double, optional boolean)]
+    expected: FAIL
+
+  [OffscreenCanvasRenderingContext2D interface: operation ellipse(unrestricted double, unrestricted double, unrestricted double, unrestricted double, unrestricted double, unrestricted double, unrestricted double, optional boolean)]
+    expected: FAIL
+
+  [Path2D interface: operation addPath(Path2D, optional DOMMatrix2DInit)]
+    expected: FAIL
+
+  [WorkerGlobalScope interface: self must inherit property "createImageBitmap(ImageBitmapSource, optional ImageBitmapOptions)" with the proper type]
+    expected: FAIL
+
+  [OffscreenCanvasRenderingContext2D interface: operation clip(optional CanvasFillRule)]
+    expected: FAIL
+
+  [WorkerGlobalScope interface: operation createImageBitmap(ImageBitmapSource, optional ImageBitmapOptions)]
+    expected: FAIL
+
+  [ImageBitmapRenderingContext interface: operation transferFromImageBitmap(ImageBitmap?)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/blob-data.https.html.ini b/tests/wpt/metadata/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/blob-data.https.html.ini
new file mode 100644
index 00000000000..042c6d3e4ae
--- /dev/null
+++ b/tests/wpt/metadata/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/blob-data.https.html.ini
@@ -0,0 +1,26 @@
+[blob-data.https.html]
+  expected: ERROR
+  [blob worker: self.crossOriginIsolated]
+    expected: FAIL
+
+  [blob worker: self.isSecureContext]
+    expected: FAIL
+
+  [blob frame: self.crossOriginIsolated]
+    expected: FAIL
+
+  [blob worker: postMessaging to a dedicated HTTP sub-worker allows them to see each others' modifications]
+    expected: FAIL
+
+  [blob frame: self.isSecureContext]
+    expected: FAIL
+
+  [blob frame: postMessaging to a dedicated blob sub-worker allows them to see each others' modifications]
+    expected: TIMEOUT
+
+  [blob worker: postMessaging to a dedicated blob sub-worker allows them to see each others' modifications]
+    expected: TIMEOUT
+
+  [blob frame: postMessaging to a dedicated HTTP sub-worker allows them to see each others' modifications]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/skip-document-with-fragment.html.ini b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/skip-document-with-fragment.html.ini
index c12c0f8ae48..6852d7663de 100644
--- a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/skip-document-with-fragment.html.ini
+++ b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/skip-document-with-fragment.html.ini
@@ -1,4 +1,8 @@
 [skip-document-with-fragment.html]
+  expected: TIMEOUT
   [Autofocus elements in iframed documents with URL fragments should be skipped.]
     expected: FAIL
 
+  [Autofocus elements in top-level browsing context's documents with URI fragments should be skipped.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index 6b68e9094e4..8b743f36e1d 100644
--- a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -1,16 +1,20 @@
 [supported-elements.html]
+  expected: TIMEOUT
   [Contenteditable element should support autofocus]
     expected: FAIL
 
   [Element with tabindex should support autofocus]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Host element with delegatesFocus including no focusable descendants should be skipped]
-    expected: FAIL
+    expected: NOTRUN
 
   [Area element should support autofocus]
-    expected: FAIL
+    expected: NOTRUN
 
   [Host element with delegatesFocus should support autofocus]
-    expected: FAIL
+    expected: NOTRUN
+
+  [Non-HTMLElement should not support autofocus]
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-empty-alt-replaced.html.ini b/tests/wpt/metadata/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-empty-alt-replaced.html.ini
new file mode 100644
index 00000000000..1ad7045d995
--- /dev/null
+++ b/tests/wpt/metadata/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-empty-alt-replaced.html.ini
@@ -0,0 +1,4 @@
+[img-empty-alt-replaced.html]
+  [Images with an empty alt attribute have an intrinsic size of zero]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
index e440b1e38c6..71edac2c5ed 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_nonescaping-3.html]
   type: testharness
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini
new file mode 100644
index 00000000000..178680e5d14
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini
@@ -0,0 +1,2 @@
+[script-onerror-insertion-point-2.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/webaudio/idlharness.https.window.js.ini b/tests/wpt/metadata/webaudio/idlharness.https.window.js.ini
index 9ba5b568945..92e7bc1149e 100644
--- a/tests/wpt/metadata/webaudio/idlharness.https.window.js.ini
+++ b/tests/wpt/metadata/webaudio/idlharness.https.window.js.ini
@@ -1187,3 +1187,168 @@
   [AudioNode interface: new ConvolverNode(context) must inherit property "disconnect(AudioNode, unsigned long, unsigned long)" with the proper type]
     expected: FAIL
 
+  [AudioNode interface: new DelayNode(context) must inherit property "connect(AudioNode, optional unsigned long, optional unsigned long)" with the proper type]
+    expected: FAIL
+
+  [BaseAudioContext interface: calling createPeriodicWave(sequence<float>, sequence<float>, optional PeriodicWaveConstraints) on new OfflineAudioContext(1, 1, sample_rate) with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [AudioNode interface: calling connect(AudioParam, optional unsigned long) on new IIRFilterNode(context, {feedforward: [1\], feedback: [1\]}) with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [BaseAudioContext interface: operation decodeAudioData(ArrayBuffer, optional DecodeSuccessCallback?, optional DecodeErrorCallback?)]
+    expected: FAIL
+
+  [BaseAudioContext interface: context must inherit property "createDelay(optional double)" with the proper type]
+    expected: FAIL
+
+  [AudioNode interface: worklet_node must inherit property "connect(AudioParam, optional unsigned long)" with the proper type]
+    expected: FAIL
+
+  [BaseAudioContext interface: calling createScriptProcessor(optional unsigned long, optional unsigned long, optional unsigned long) on new OfflineAudioContext(1, 1, sample_rate) with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [BaseAudioContext interface: operation createScriptProcessor(optional unsigned long, optional unsigned long, optional unsigned long)]
+    expected: FAIL
+
+  [AudioNode interface: calling connect(AudioNode, optional unsigned long, optional unsigned long) on context.createScriptProcessor() with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [AudioNode interface: new DynamicsCompressorNode(context) must inherit property "connect(AudioParam, optional unsigned long)" with the proper type]
+    expected: FAIL
+
+  [AudioNode interface: new MediaStreamAudioDestinationNode(context) must inherit property "connect(AudioParam, optional unsigned long)" with the proper type]
+    expected: FAIL
+
+  [BaseAudioContext interface: new OfflineAudioContext(1, 1, sample_rate) must inherit property "createIIRFilter(sequence<double>, sequence<double>)" with the proper type]
+    expected: FAIL
+
+  [AudioNode interface: context.createScriptProcessor() must inherit property "connect(AudioParam, optional unsigned long)" with the proper type]
+    expected: FAIL
+
+  [AudioNode interface: calling connect(AudioParam, optional unsigned long) on new ConvolverNode(context) with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [AudioNode interface: new DynamicsCompressorNode(context) must inherit property "connect(AudioNode, optional unsigned long, optional unsigned long)" with the proper type]
+    expected: FAIL
+
+  [AudioNode interface: calling connect(AudioNode, optional unsigned long, optional unsigned long) on new MediaStreamAudioDestinationNode(context) with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [AudioNode interface: calling connect(AudioNode, optional unsigned long, optional unsigned long) on worklet_node with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [BaseAudioContext interface: operation createPeriodicWave(sequence<float>, sequence<float>, optional PeriodicWaveConstraints)]
+    expected: FAIL
+
+  [BaseAudioContext interface: calling decodeAudioData(ArrayBuffer, optional DecodeSuccessCallback?, optional DecodeErrorCallback?) on context with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [AudioNode interface: calling connect(AudioNode, optional unsigned long, optional unsigned long) on new DelayNode(context) with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [AudioNode interface: context.createScriptProcessor() must inherit property "connect(AudioNode, optional unsigned long, optional unsigned long)" with the proper type]
+    expected: FAIL
+
+  [BaseAudioContext interface: calling createPeriodicWave(sequence<float>, sequence<float>, optional PeriodicWaveConstraints) on context with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [BaseAudioContext interface: calling createDelay(optional double) on context with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [BaseAudioContext interface: calling decodeAudioData(ArrayBuffer, optional DecodeSuccessCallback?, optional DecodeErrorCallback?) on new OfflineAudioContext(1, 1, sample_rate) with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [BaseAudioContext interface: new OfflineAudioContext(1, 1, sample_rate) must inherit property "createScriptProcessor(optional unsigned long, optional unsigned long, optional unsigned long)" with the proper type]
+    expected: FAIL
+
+  [BaseAudioContext interface: new OfflineAudioContext(1, 1, sample_rate) must inherit property "createPeriodicWave(sequence<float>, sequence<float>, optional PeriodicWaveConstraints)" with the proper type]
+    expected: FAIL
+
+  [AudioNode interface: new MediaStreamAudioDestinationNode(context) must inherit property "connect(AudioNode, optional unsigned long, optional unsigned long)" with the proper type]
+    expected: FAIL
+
+  [AudioNode interface: calling connect(AudioParam, optional unsigned long) on new WaveShaperNode(context) with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [BaseAudioContext interface: context must inherit property "createScriptProcessor(optional unsigned long, optional unsigned long, optional unsigned long)" with the proper type]
+    expected: FAIL
+
+  [BaseAudioContext interface: calling createIIRFilter(sequence<double>, sequence<double>) on context with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [AudioNode interface: calling connect(AudioNode, optional unsigned long, optional unsigned long) on new IIRFilterNode(context, {feedforward: [1\], feedback: [1\]}) with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [AudioNode interface: new IIRFilterNode(context, {feedforward: [1\], feedback: [1\]}) must inherit property "connect(AudioNode, optional unsigned long, optional unsigned long)" with the proper type]
+    expected: FAIL
+
+  [BaseAudioContext interface: calling createIIRFilter(sequence<double>, sequence<double>) on new OfflineAudioContext(1, 1, sample_rate) with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [AudioNode interface: new ConvolverNode(context) must inherit property "connect(AudioParam, optional unsigned long)" with the proper type]
+    expected: FAIL
+
+  [BaseAudioContext interface: operation createIIRFilter(sequence<double>, sequence<double>)]
+    expected: FAIL
+
+  [AudioNode interface: calling connect(AudioParam, optional unsigned long) on new DynamicsCompressorNode(context) with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [AudioNode interface: calling connect(AudioParam, optional unsigned long) on new DelayNode(context) with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [AudioNode interface: worklet_node must inherit property "connect(AudioNode, optional unsigned long, optional unsigned long)" with the proper type]
+    expected: FAIL
+
+  [BaseAudioContext interface: new OfflineAudioContext(1, 1, sample_rate) must inherit property "createDelay(optional double)" with the proper type]
+    expected: FAIL
+
+  [AudioNode interface: calling connect(AudioNode, optional unsigned long, optional unsigned long) on new WaveShaperNode(context) with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [AudioNode interface: calling connect(AudioParam, optional unsigned long) on new MediaStreamAudioDestinationNode(context) with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [BaseAudioContext interface: context must inherit property "createPeriodicWave(sequence<float>, sequence<float>, optional PeriodicWaveConstraints)" with the proper type]
+    expected: FAIL
+
+  [AudioNode interface: calling connect(AudioNode, optional unsigned long, optional unsigned long) on new DynamicsCompressorNode(context) with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [BaseAudioContext interface: calling createScriptProcessor(optional unsigned long, optional unsigned long, optional unsigned long) on context with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [AudioNode interface: calling connect(AudioParam, optional unsigned long) on worklet_node with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [AudioNode interface: new ConvolverNode(context) must inherit property "connect(AudioNode, optional unsigned long, optional unsigned long)" with the proper type]
+    expected: FAIL
+
+  [AudioNode interface: new WaveShaperNode(context) must inherit property "connect(AudioNode, optional unsigned long, optional unsigned long)" with the proper type]
+    expected: FAIL
+
+  [BaseAudioContext interface: context must inherit property "createIIRFilter(sequence<double>, sequence<double>)" with the proper type]
+    expected: FAIL
+
+  [BaseAudioContext interface: calling createDelay(optional double) on new OfflineAudioContext(1, 1, sample_rate) with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [AudioNode interface: new DelayNode(context) must inherit property "connect(AudioParam, optional unsigned long)" with the proper type]
+    expected: FAIL
+
+  [AudioNode interface: new IIRFilterNode(context, {feedforward: [1\], feedback: [1\]}) must inherit property "connect(AudioParam, optional unsigned long)" with the proper type]
+    expected: FAIL
+
+  [AudioNode interface: new WaveShaperNode(context) must inherit property "connect(AudioParam, optional unsigned long)" with the proper type]
+    expected: FAIL
+
+  [BaseAudioContext interface: operation createDelay(optional double)]
+    expected: FAIL
+
+  [AudioNode interface: calling connect(AudioParam, optional unsigned long) on context.createScriptProcessor() with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [AudioNode interface: calling connect(AudioNode, optional unsigned long, optional unsigned long) on new ConvolverNode(context) with too few arguments must throw TypeError]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini
index 11165cfdf57..68c9d67d20f 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini
@@ -8,3 +8,6 @@
   [X Rendered audio for channel 5 does not equal [0,0.0626220703125,0.125030517578125,0.18695068359375,0.24810791015625,0.308319091796875,0.3673095703125,0.42486572265625,0.480743408203125,0.53472900390625,0.58660888671875,0.636199951171875,0.68328857421875,0.727691650390625,0.76922607421875,0.8077392578125...\] with an element-wise tolerance of {"absoluteThreshold":0.000030517578125,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[1\]\t3.6732959747314453e-1\t6.2622070312500000e-2\t3.0470752716064453e-1\t4.8658168859649127e+0\t3.0517578125000000e-5\n\t[2\]\t6.8329977989196777e-1\t1.2503051757812500e-1\t5.5826926231384277e-1\t4.4650639949963384e+0\t3.0517578125000000e-5\n\t[3\]\t9.0373212099075317e-1\t1.8695068359375000e-1\t7.1678143739700317e-1\t3.8340669508039502e+0\t3.0517578125000000e-5\n\t[4\]\t9.9780619144439697e-1\t2.4810791015625000e-1\t7.4969828128814697e-1\t3.0216621502152523e+0\t3.0517578125000000e-5\n\t[5\]\t9.5236867666244507e-1\t3.0831909179687500e-1\t6.4404958486557007e-1\t2.0889059484187866e+0\t3.0517578125000000e-5\n\t...and 42295 more errors.\n\tMax AbsError of 1.9986916780471802e+0 at index of 24610.\n\t[24610\]\t9.9994289875030518e-1\t-9.9874877929687500e-1\t1.9986916780471802e+0\t2.0011956154322119e+0\t3.0517578125000000e-5\n\tMax RelError of Infinity at index of 10584.\n\t[10584\]\t-5.8778524398803711e-1\t0.0000000000000000e+0\t5.8778524398803711e-1\tInfinity\t3.0517578125000000e-5\n]
     expected: FAIL
 
+  [X Rendered audio for channel 5 does not equal [0,0.0626220703125,0.125030517578125,0.18695068359375,0.24810791015625,0.308319091796875,0.3673095703125,0.42486572265625,0.480743408203125,0.53472900390625,0.58660888671875,0.636199951171875,0.68328857421875,0.727691650390625,0.76922607421875,0.8077392578125...\] with an element-wise tolerance of {"absoluteThreshold":0.000030517578125,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[1\]\t3.6732959747314453e-1\t6.2622070312500000e-2\t3.0470752716064453e-1\t4.8658168859649127e+0\t3.0517578125000000e-5\n\t[2\]\t6.8329977989196777e-1\t1.2503051757812500e-1\t5.5826926231384277e-1\t4.4650639949963384e+0\t3.0517578125000000e-5\n\t[3\]\t9.0373212099075317e-1\t1.8695068359375000e-1\t7.1678143739700317e-1\t3.8340669508039502e+0\t3.0517578125000000e-5\n\t[4\]\t9.9780619144439697e-1\t2.4810791015625000e-1\t7.4969828128814697e-1\t3.0216621502152523e+0\t3.0517578125000000e-5\n\t[5\]\t9.5236867666244507e-1\t3.0831909179687500e-1\t6.4404958486557007e-1\t2.0889059484187866e+0\t3.0517578125000000e-5\n\t...and 44052 more errors.\n\tMax AbsError of 1.9986611604690552e+0 at index of 23900.\n\t[23900\]\t-9.9994289875030518e-1\t9.9871826171875000e-1\t1.9986611604690552e+0\t2.0012262087101997e+0\t3.0517578125000000e-5\n\tMax RelError of Infinity at index of 10584.\n\t[10584\]\t-5.8778524398803711e-1\t0.0000000000000000e+0\t5.8778524398803711e-1\tInfinity\t3.0517578125000000e-5\n]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
index fff5df68738..078f8366125 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
@@ -122,3 +122,9 @@
   [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[30\]\t1.9724091887474060e-1\t9.5236867666244507e-1\t7.5512775778770447e-1\t7.9289436569253091e-1\t3.8985999999999999e-3\n\t[60\]\t-2.2450675070285797e-1\t-5.8084785938262939e-1\t3.5634110867977142e-1\t6.1348441407448528e-1\t3.8985999999999999e-3\n\t[90\]\t-3.7808802723884583e-1\t-5.9811043739318848e-1\t2.2002241015434265e-1\t3.6786251568070089e-1\t3.8985999999999999e-3\n\t[120\]\t7.6881676912307739e-1\t9.4563448429107666e-1\t1.7681771516799927e-1\t1.8698315057805445e-1\t3.8985999999999999e-3\n\t[151\]\t5.4644601186737418e-4\t-4.1306272149085999e-2\t4.1852718160953373e-2\t1.0132291292202573e+0\t3.8985999999999999e-3\n\t...and 1419 more errors.\n\tMax AbsError of 9.8956179618835449e-1 at index of 38059.\n\t[38059\]\t4.8494413328898828e-34\t-9.8956179618835449e-1\t9.8956179618835449e-1\t1.0000000000000000e+0\t3.8985999999999999e-3\n\tMax RelError of 1.0132291292202573e+0 at index of 151.\n]
     expected: FAIL
 
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[19030\]\t-2.0861674000000000e+7\t-7.3546999692916870e-1\t2.0861673264530003e+7\t2.8365090828496624e+7\t3.8985999999999999e-3\n\t[19031\]\t-3.6017334461212158e-1\t-6.9157749414443970e-1\t3.3140414953231812e-1\t4.7920030992665957e-1\t3.8985999999999999e-3\n\t[38059\]\t-4.2010196000000000e+7\t-9.8956179618835449e-1\t4.2010195010438204e+7\t4.2453331537510090e+7\t3.8985999999999999e-3\n\t[38060\]\t-8.8409073650836945e-2\t-9.9664616584777832e-1\t9.0823709219694138e-1\t9.1129341918891205e-1\t3.8985999999999999e-3\n\tMax AbsError of 4.2010195010438204e+7 at index of 38059.\n\tMax RelError of 4.2453331537510090e+7 at index of 38059.\n]
+    expected: FAIL
+
+  [X SNR (-109.9902709475588 dB) is not greater than or equal to 65.737. Got -109.9902709475588.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webgl/idlharness.any.js.ini b/tests/wpt/metadata/webgl/idlharness.any.js.ini
index 8d093d2e001..eaae0a11f89 100644
--- a/tests/wpt/metadata/webgl/idlharness.any.js.ini
+++ b/tests/wpt/metadata/webgl/idlharness.any.js.ini
@@ -3518,6 +3518,18 @@
   [WebGL2RenderingContext interface: constant NOTEQUAL on interface object]
     expected: FAIL
 
+  [WebGL2RenderingContext interface: operation framebufferTextureLayer(GLenum, GLenum, WebGLTexture?, GLint, GLint)]
+    expected: FAIL
+
+  [WebGL2RenderingContext interface: operation getBufferSubData(GLenum, GLintptr, ArrayBufferView, optional GLuint, optional GLuint)]
+    expected: FAIL
+
+  [WebGL2RenderingContext interface: operation invalidateFramebuffer(GLenum, sequence<GLenum>)]
+    expected: FAIL
+
+  [WebGL2RenderingContext interface: operation invalidateSubFramebuffer(GLenum, sequence<GLenum>, GLint, GLint, GLsizei, GLsizei)]
+    expected: FAIL
+
 
 [idlharness.any.worker.html]
   [WebGL2RenderingContext interface: constant ONE_MINUS_SRC_COLOR on interface object]
@@ -9058,3 +9070,15 @@
   [WebGL2RenderingContext interface: constant NOTEQUAL on interface object]
     expected: FAIL
 
+  [WebGL2RenderingContext interface: operation framebufferTextureLayer(GLenum, GLenum, WebGLTexture?, GLint, GLint)]
+    expected: FAIL
+
+  [WebGL2RenderingContext interface: operation getBufferSubData(GLenum, GLintptr, ArrayBufferView, optional GLuint, optional GLuint)]
+    expected: FAIL
+
+  [WebGL2RenderingContext interface: operation invalidateFramebuffer(GLenum, sequence<GLenum>)]
+    expected: FAIL
+
+  [WebGL2RenderingContext interface: operation invalidateSubFramebuffer(GLenum, sequence<GLenum>, GLint, GLint, GLsizei, GLsizei)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webmessaging/broadcastchannel/basics.html.ini b/tests/wpt/metadata/webmessaging/broadcastchannel/basics.html.ini
new file mode 100644
index 00000000000..c8d269db259
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/broadcastchannel/basics.html.ini
@@ -0,0 +1,4 @@
+[basics.html]
+  [Closing a channel in onmessage doesn't cancel already queued events]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webmessaging/without-ports/017.html.ini b/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
deleted file mode 100644
index 064cf47545b..00000000000
--- a/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[017.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, about:blank]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/webmessaging/without-ports/018.html.ini b/tests/wpt/metadata/webmessaging/without-ports/018.html.ini
deleted file mode 100644
index 663a1f8fa30..00000000000
--- a/tests/wpt/metadata/webmessaging/without-ports/018.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[018.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, javascript:]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/websockets/constructor/009.html.ini b/tests/wpt/metadata/websockets/constructor/009.html.ini
new file mode 100644
index 00000000000..cafe256b18c
--- /dev/null
+++ b/tests/wpt/metadata/websockets/constructor/009.html.ini
@@ -0,0 +1,5 @@
+[009.html?wss]
+  expected: TIMEOUT
+
+[009.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/websockets/constructor/022.html.ini b/tests/wpt/metadata/websockets/constructor/022.html.ini
new file mode 100644
index 00000000000..da02a1678d5
--- /dev/null
+++ b/tests/wpt/metadata/websockets/constructor/022.html.ini
@@ -0,0 +1,5 @@
+[022.html]
+  expected: TIMEOUT
+
+[022.html?wss]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/websockets/cookies/005.html.ini b/tests/wpt/metadata/websockets/cookies/005.html.ini
index 03e42d20a06..83aee6d14e4 100644
--- a/tests/wpt/metadata/websockets/cookies/005.html.ini
+++ b/tests/wpt/metadata/websockets/cookies/005.html.ini
@@ -4,3 +4,4 @@
 
 [005.html?wss]
   type: testharness
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/websockets/opening-handshake/003-sets-origin.worker.js.ini b/tests/wpt/metadata/websockets/opening-handshake/003-sets-origin.worker.js.ini
new file mode 100644
index 00000000000..bf535e0993d
--- /dev/null
+++ b/tests/wpt/metadata/websockets/opening-handshake/003-sets-origin.worker.js.ini
@@ -0,0 +1,2 @@
+[003-sets-origin.worker.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/websockets/opening-handshake/003.html.ini b/tests/wpt/metadata/websockets/opening-handshake/003.html.ini
new file mode 100644
index 00000000000..44f502faaa6
--- /dev/null
+++ b/tests/wpt/metadata/websockets/opening-handshake/003.html.ini
@@ -0,0 +1,5 @@
+[003.html?wss]
+  expected: TIMEOUT
+
+[003.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/websockets/opening-handshake/005.html.ini b/tests/wpt/metadata/websockets/opening-handshake/005.html.ini
new file mode 100644
index 00000000000..1afd2545cd2
--- /dev/null
+++ b/tests/wpt/metadata/websockets/opening-handshake/005.html.ini
@@ -0,0 +1,5 @@
+[005.html?wss]
+  expected: TIMEOUT
+
+[005.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/webvr/idlharness.https.html.ini b/tests/wpt/metadata/webvr/idlharness.https.html.ini
index 7d4cec8279e..75bbd495cd2 100644
--- a/tests/wpt/metadata/webvr/idlharness.https.html.ini
+++ b/tests/wpt/metadata/webvr/idlharness.https.html.ini
@@ -17,3 +17,6 @@
   [WebVR IDL test]
     expected: FAIL
 
+  [VRDisplay interface: operation requestPresent(sequence<VRLayerInit>)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/dom-overlay/ar_dom_overlay.https.html.ini b/tests/wpt/metadata/webxr/dom-overlay/ar_dom_overlay.https.html.ini
index 434a6297d4b..224197c5a20 100644
--- a/tests/wpt/metadata/webxr/dom-overlay/ar_dom_overlay.https.html.ini
+++ b/tests/wpt/metadata/webxr/dom-overlay/ar_dom_overlay.https.html.ini
@@ -5,3 +5,21 @@
   [Ensures DOM Overlay feature works for immersive-ar]
     expected: FAIL
 
+  [Ensures DOM Overlay input deduplication works]
+    expected: FAIL
+
+  [Ensures DOM Overlay feature works for immersive-ar, body element]
+    expected: FAIL
+
+  [Ensures DOM Overlay rejected without root element]
+    expected: FAIL
+
+  [Ensures DOM Overlay Fullscreen API doesn't change DOM overlay]
+    expected: FAIL
+
+  [Ensures DOM Overlay feature works for immersive-ar, div element]
+    expected: FAIL
+
+  [Ensures DOM Overlay interactions on cross origin iframe are ignored]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/events_session_squeeze.https.html.ini b/tests/wpt/metadata/webxr/events_session_squeeze.https.html.ini
new file mode 100644
index 00000000000..63b20530a3f
--- /dev/null
+++ b/tests/wpt/metadata/webxr/events_session_squeeze.https.html.ini
@@ -0,0 +1,5 @@
+[events_session_squeeze.https.html]
+  expected: ERROR
+  [XRInputSources primary input presses properly fires off the right events]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/webxr/idlharness.https.window.js.ini b/tests/wpt/metadata/webxr/idlharness.https.window.js.ini
index 8a8492b1adf..d9c94314f58 100644
--- a/tests/wpt/metadata/webxr/idlharness.https.window.js.ini
+++ b/tests/wpt/metadata/webxr/idlharness.https.window.js.ini
@@ -137,3 +137,6 @@
   [XRSystem interface: operation requestSession(XRSessionMode, XRSessionInit)]
     expected: FAIL
 
+  [XRSystem interface: operation requestSession(XRSessionMode, optional XRSessionInit)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/workers/semantics/multiple-workers/005.html.ini b/tests/wpt/metadata/workers/semantics/multiple-workers/005.html.ini
index 268949ced5c..f584fce5df1 100644
--- a/tests/wpt/metadata/workers/semantics/multiple-workers/005.html.ini
+++ b/tests/wpt/metadata/workers/semantics/multiple-workers/005.html.ini
@@ -1,4 +1,5 @@
 [005.html]
+  expected: ERROR
   [dedicated worker in shared worker in dedicated worker]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/xhr/xmlhttprequest-sync-default-feature-policy.sub.html.ini b/tests/wpt/metadata/xhr/xmlhttprequest-sync-default-feature-policy.sub.html.ini
index 66a80544640..3bd06a46485 100644
--- a/tests/wpt/metadata/xhr/xmlhttprequest-sync-default-feature-policy.sub.html.ini
+++ b/tests/wpt/metadata/xhr/xmlhttprequest-sync-default-feature-policy.sub.html.ini
@@ -1,7 +1,11 @@
 [xmlhttprequest-sync-default-feature-policy.sub.html]
+  expected: TIMEOUT
   [Feature policy "sync-xhr" can be disabled in cross-origin iframes using "allow" attribute.]
     expected: FAIL
 
   [Feature policy "sync-xhr" can be disabled in same-origin iframes using "allow" attribute.]
     expected: FAIL
 
+  [Default "sync-xhr" feature policy ["*"\] allows same-origin iframes.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/mozilla/meta/mozilla/cross-origin-objects/cross-origin-objects.html.ini b/tests/wpt/mozilla/meta/mozilla/cross-origin-objects/cross-origin-objects.html.ini
new file mode 100644
index 00000000000..4f29d8c654b
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/cross-origin-objects/cross-origin-objects.html.ini
@@ -0,0 +1,4 @@
+[cross-origin-objects.html]
+  [Only whitelisted properties are accessible cross-origin]
+    expected: FAIL
+
diff --git a/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.pattern.image.nonexistent-but-loading.html b/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.pattern.image.nonexistent-but-loading.html
new file mode 100644
index 00000000000..d3a219d7b2f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.pattern.image.nonexistent-but-loading.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /2dcontext/tools/gentest.py. -->
+<title>Canvas test: 2d.pattern.image.nonexistent-but-loading</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/2dcontext/resources/canvas-tests.js"></script>
+<link rel="stylesheet" href="/2dcontext/resources/canvas-tests.css">
+<body class="show_output">
+
+<h1>2d.pattern.image.nonexistent-but-loading</h1>
+<p class="desc"></p>
+
+
+<p class="output">Actual output:</p>
+<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+
+<ul id="d"></ul>
+<script>
+var t = async_test("");
+_addTest(function(canvas, ctx) {
+
+var img = document.createElement("img");
+img.src = "/images/no-such-image-really.png";
+_assertSame(ctx.createPattern(img, 'repeat'), null, "ctx.createPattern(img, 'repeat')", "null");
+var img = document.createElementNS("http://www.w3.org/2000/svg", "image");
+img.src = "/images/no-such-image-really.png";
+_assertSame(ctx.createPattern(img, 'repeat'), null, "ctx.createPattern(img, 'repeat')", "null");
+
+
+});
+</script>
+
diff --git a/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.pattern.image.nonexistent.html b/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.pattern.image.nonexistent.html
new file mode 100644
index 00000000000..c6c33b5c522
--- /dev/null
+++ b/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.pattern.image.nonexistent.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /2dcontext/tools/gentest.py. -->
+<title>Canvas test: 2d.pattern.image.nonexistent</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/2dcontext/resources/canvas-tests.js"></script>
+<link rel="stylesheet" href="/2dcontext/resources/canvas-tests.css">
+<body class="show_output">
+
+<h1>2d.pattern.image.nonexistent</h1>
+<p class="desc"></p>
+
+
+<p class="output">Actual output:</p>
+<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+
+<ul id="d"></ul>
+<script>
+var t = async_test("");
+_addTest(function(canvas, ctx) {
+
+var img = document.getElementById('no-such-image-really.png');
+assert_throws_dom("INVALID_STATE_ERR", function() { ctx.createPattern(img, 'repeat'); });
+
+
+});
+</script>
+<img src="/images/no-such-image-really.png" id="no-such-image-really.png" class="resource">
+
diff --git a/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.pattern.image.nosrc.html b/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.pattern.image.nosrc.html
new file mode 100644
index 00000000000..0c275f82ac7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.pattern.image.nosrc.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /2dcontext/tools/gentest.py. -->
+<title>Canvas test: 2d.pattern.image.nosrc</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/2dcontext/resources/canvas-tests.js"></script>
+<link rel="stylesheet" href="/2dcontext/resources/canvas-tests.css">
+<body class="show_output">
+
+<h1>2d.pattern.image.nosrc</h1>
+<p class="desc"></p>
+
+
+<p class="output">Actual output:</p>
+<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+
+<ul id="d"></ul>
+<script>
+var t = async_test("");
+_addTest(function(canvas, ctx) {
+
+var img = document.createElement("img");
+_assertSame(ctx.createPattern(img, 'repeat'), null, "ctx.createPattern(img, 'repeat')", "null");
+var img = document.createElementNS("http://www.w3.org/2000/svg", "image");
+_assertSame(ctx.createPattern(img, 'repeat'), null, "ctx.createPattern(img, 'repeat')", "null");
+
+
+});
+</script>
+
diff --git a/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.pattern.image.zeroheight.html b/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.pattern.image.zeroheight.html
new file mode 100644
index 00000000000..143eec9d2cf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.pattern.image.zeroheight.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /2dcontext/tools/gentest.py. -->
+<title>Canvas test: 2d.pattern.image.zeroheight</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/2dcontext/resources/canvas-tests.js"></script>
+<link rel="stylesheet" href="/2dcontext/resources/canvas-tests.css">
+<body class="show_output">
+
+<h1>2d.pattern.image.zeroheight</h1>
+<p class="desc"></p>
+
+
+<p class="output">Actual output:</p>
+<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+
+<ul id="d"></ul>
+<script>
+var t = async_test("");
+_addTest(function(canvas, ctx) {
+
+var img = document.getElementById('red-zeroheight.svg');
+_assertSame(ctx.createPattern(img, 'repeat'), null, "ctx.createPattern(img, 'repeat')", "null");
+
+
+});
+</script>
+<img src="/images/red-zeroheight.svg" id="red-zeroheight.svg" class="resource">
+
diff --git a/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.pattern.image.zerowidth.html b/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.pattern.image.zerowidth.html
new file mode 100644
index 00000000000..66890cfe2e0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.pattern.image.zerowidth.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /2dcontext/tools/gentest.py. -->
+<title>Canvas test: 2d.pattern.image.zerowidth</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/2dcontext/resources/canvas-tests.js"></script>
+<link rel="stylesheet" href="/2dcontext/resources/canvas-tests.css">
+<body class="show_output">
+
+<h1>2d.pattern.image.zerowidth</h1>
+<p class="desc"></p>
+
+
+<p class="output">Actual output:</p>
+<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+
+<ul id="d"></ul>
+<script>
+var t = async_test("");
+_addTest(function(canvas, ctx) {
+
+var img = document.getElementById('red-zerowidth.svg');
+_assertSame(ctx.createPattern(img, 'repeat'), null, "ctx.createPattern(img, 'repeat')", "null");
+
+
+});
+</script>
+<img src="/images/red-zerowidth.svg" id="red-zerowidth.svg" class="resource">
+
diff --git a/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.pattern.svgimage.nonexistent.html b/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.pattern.svgimage.nonexistent.html
new file mode 100644
index 00000000000..756c2094c96
--- /dev/null
+++ b/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.pattern.svgimage.nonexistent.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /2dcontext/tools/gentest.py. -->
+<title>Canvas test: 2d.pattern.svgimage.nonexistent</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/2dcontext/resources/canvas-tests.js"></script>
+<link rel="stylesheet" href="/2dcontext/resources/canvas-tests.css">
+<body class="show_output">
+
+<h1>2d.pattern.svgimage.nonexistent</h1>
+<p class="desc"></p>
+
+
+<p class="output">Actual output:</p>
+<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+
+<ul id="d"></ul>
+<script>
+var t = async_test("");
+_addTest(function(canvas, ctx) {
+
+var img = document.getElementById('no-such-image-really.png');
+assert_throws_dom("INVALID_STATE_ERR", function() { ctx.createPattern(img, 'repeat'); });
+
+
+});
+</script>
+<svg><image xlink:href="/images/no-such-image-really.png" id="no-such-image-really.png" class="resource"></svg>
+
diff --git a/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.pattern.svgimage.zeroheight.html b/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.pattern.svgimage.zeroheight.html
new file mode 100644
index 00000000000..2cb1374d2db
--- /dev/null
+++ b/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.pattern.svgimage.zeroheight.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /2dcontext/tools/gentest.py. -->
+<title>Canvas test: 2d.pattern.svgimage.zeroheight</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/2dcontext/resources/canvas-tests.js"></script>
+<link rel="stylesheet" href="/2dcontext/resources/canvas-tests.css">
+<body class="show_output">
+
+<h1>2d.pattern.svgimage.zeroheight</h1>
+<p class="desc"></p>
+
+
+<p class="output">Actual output:</p>
+<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+
+<ul id="d"></ul>
+<script>
+var t = async_test("");
+_addTest(function(canvas, ctx) {
+
+var img = document.getElementById('red-zeroheight.svg');
+_assertSame(ctx.createPattern(img, 'repeat'), null, "ctx.createPattern(img, 'repeat')", "null");
+
+
+});
+</script>
+<svg><image xlink:href="/images/red-zeroheight.svg" id="red-zeroheight.svg" class="resource"></svg>
+
diff --git a/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.pattern.svgimage.zerowidth.html b/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.pattern.svgimage.zerowidth.html
new file mode 100644
index 00000000000..0b3f70ddf00
--- /dev/null
+++ b/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/2d.pattern.svgimage.zerowidth.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /2dcontext/tools/gentest.py. -->
+<title>Canvas test: 2d.pattern.svgimage.zerowidth</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/2dcontext/resources/canvas-tests.js"></script>
+<link rel="stylesheet" href="/2dcontext/resources/canvas-tests.css">
+<body class="show_output">
+
+<h1>2d.pattern.svgimage.zerowidth</h1>
+<p class="desc"></p>
+
+
+<p class="output">Actual output:</p>
+<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+
+<ul id="d"></ul>
+<script>
+var t = async_test("");
+_addTest(function(canvas, ctx) {
+
+var img = document.getElementById('red-zerowidth.svg');
+_assertSame(ctx.createPattern(img, 'repeat'), null, "ctx.createPattern(img, 'repeat')", "null");
+
+
+});
+</script>
+<svg><image xlink:href="/images/red-zerowidth.svg" id="red-zerowidth.svg" class="resource"></svg>
+
diff --git a/tests/wpt/web-platform-tests/2dcontext/tools/gentestutils.py b/tests/wpt/web-platform-tests/2dcontext/tools/gentestutils.py
index bd1e3c75768..64ad669b329 100644
--- a/tests/wpt/web-platform-tests/2dcontext/tools/gentestutils.py
+++ b/tests/wpt/web-platform-tests/2dcontext/tools/gentestutils.py
@@ -361,6 +361,12 @@ def genTestUtils(TESTOUTPUTDIR, IMAGEOUTPUTDIR, TEMPLATEFILE, NAME2DIRFILE, ISOF
                 used_images[i] = 1
                 i = '../images/%s' % i
             images += '<img src="%s" id="%s" class="resource">\n' % (i,id)
+        for i in test.get('svgimages', []):
+            id = i.split('/')[-1]
+            if '/' not in i:
+                used_images[i] = 1
+                i = '../images/%s' % i
+            images += '<svg><image xlink:href="%s" id="%s" class="resource"></svg>\n' % (i,id)
         images = images.replace("../images/", "/images/")
 
         fonts = ''
diff --git a/tests/wpt/web-platform-tests/2dcontext/tools/tests2d.yaml b/tests/wpt/web-platform-tests/2dcontext/tools/tests2d.yaml
index 6b971a4b2fc..42a572995a6 100644
--- a/tests/wpt/web-platform-tests/2dcontext/tools/tests2d.yaml
+++ b/tests/wpt/web-platform-tests/2dcontext/tools/tests2d.yaml
@@ -2898,13 +2898,87 @@
 
 - name: 2d.pattern.image.broken
   testing:
-    - 2d.pattern.incomplete.image
+    - 2d.pattern.broken.image
   images:
     - broken.png
   code: |
     var img = document.getElementById('broken.png');
     @assert ctx.createPattern(img, 'repeat') === null;
 
+- name: 2d.pattern.image.nonexistent
+  testing:
+    - 2d.pattern.nonexistent.image
+  images:
+    - no-such-image-really.png
+  code: |
+    var img = document.getElementById('no-such-image-really.png');
+    @assert throws INVALID_STATE_ERR ctx.createPattern(img, 'repeat');
+
+- name: 2d.pattern.svgimage.nonexistent
+  testing:
+    - 2d.pattern.nonexistent.svgimage
+  svgimages:
+    - no-such-image-really.png
+  code: |
+    var img = document.getElementById('no-such-image-really.png');
+    @assert throws INVALID_STATE_ERR ctx.createPattern(img, 'repeat');
+
+- name: 2d.pattern.image.nonexistent-but-loading
+  testing:
+    - 2d.pattern.nonexistent-but-loading.image
+  code: |
+    var img = document.createElement("img");
+    img.src = "/images/no-such-image-really.png";
+    @assert ctx.createPattern(img, 'repeat') === null;
+    var img = document.createElementNS("http://www.w3.org/2000/svg", "image");
+    img.src = "/images/no-such-image-really.png";
+    @assert ctx.createPattern(img, 'repeat') === null;
+
+- name: 2d.pattern.image.nosrc
+  testing:
+    - 2d.pattern.nosrc.image
+  code: |
+    var img = document.createElement("img");
+    @assert ctx.createPattern(img, 'repeat') === null;
+    var img = document.createElementNS("http://www.w3.org/2000/svg", "image");
+    @assert ctx.createPattern(img, 'repeat') === null;
+
+- name: 2d.pattern.image.zerowidth
+  testing:
+    - 2d.pattern.zerowidth.image
+  images:
+    - red-zerowidth.svg
+  code: |
+    var img = document.getElementById('red-zerowidth.svg');
+    @assert ctx.createPattern(img, 'repeat') === null;
+
+- name: 2d.pattern.image.zeroheight
+  testing:
+    - 2d.pattern.zeroheight.image
+  images:
+    - red-zeroheight.svg
+  code: |
+    var img = document.getElementById('red-zeroheight.svg');
+    @assert ctx.createPattern(img, 'repeat') === null;
+
+- name: 2d.pattern.svgimage.zerowidth
+  testing:
+    - 2d.pattern.zerowidth.svgimage
+  svgimages:
+    - red-zerowidth.svg
+  code: |
+    var img = document.getElementById('red-zerowidth.svg');
+    @assert ctx.createPattern(img, 'repeat') === null;
+
+- name: 2d.pattern.svgimage.zeroheight
+  testing:
+    - 2d.pattern.zeroheight.svgimage
+  svgimages:
+    - red-zeroheight.svg
+  code: |
+    var img = document.getElementById('red-zeroheight.svg');
+    @assert ctx.createPattern(img, 'repeat') === null;
+
 - name: 2d.pattern.repeat.empty
   testing:
     - 2d.pattern.missing
diff --git a/tests/wpt/web-platform-tests/clipboard-apis/async-interfaces.https.html b/tests/wpt/web-platform-tests/clipboard-apis/async-interfaces.https.html
index 1c423e95b66..06b777fbe32 100644
--- a/tests/wpt/web-platform-tests/clipboard-apis/async-interfaces.https.html
+++ b/tests/wpt/web-platform-tests/clipboard-apis/async-interfaces.https.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <meta charset=utf-8>
 <title>Clipboard IDL test</title>
 <link rel='help' href='https://w3c.github.io/clipboard-apis/#async-clipboard-api'>
diff --git a/tests/wpt/web-platform-tests/clipboard-apis/async-navigator-clipboard-basics.https.html b/tests/wpt/web-platform-tests/clipboard-apis/async-navigator-clipboard-basics.https.html
index 22358f16d96..65759186a6c 100644
--- a/tests/wpt/web-platform-tests/clipboard-apis/async-navigator-clipboard-basics.https.html
+++ b/tests/wpt/web-platform-tests/clipboard-apis/async-navigator-clipboard-basics.https.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <meta charset="utf-8">
 <title>Async Clipboard input type validation tests</title>
 <link rel="help" href="https://w3c.github.io/clipboard-apis/#async-clipboard-api">
diff --git a/tests/wpt/web-platform-tests/clipboard-apis/async-raw-write-read.tentative.https.html b/tests/wpt/web-platform-tests/clipboard-apis/async-raw-write-read.tentative.https.html
index 6cfa2dbcca7..a6889d61efc 100644
--- a/tests/wpt/web-platform-tests/clipboard-apis/async-raw-write-read.tentative.https.html
+++ b/tests/wpt/web-platform-tests/clipboard-apis/async-raw-write-read.tentative.https.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <meta charset="utf-8">
 <title> Async Clipboard raw write -> Async Clipboard raw read tests </title>
 <link rel="help" href="https://w3c.github.io/clipboard-apis/#async-clipboard-api">
diff --git a/tests/wpt/web-platform-tests/clipboard-apis/async-write-blobs-read-blobs-manual.https.html b/tests/wpt/web-platform-tests/clipboard-apis/async-write-blobs-read-blobs-manual.https.html
index b5f0f3d9dc1..f53d7f9c36e 100644
--- a/tests/wpt/web-platform-tests/clipboard-apis/async-write-blobs-read-blobs-manual.https.html
+++ b/tests/wpt/web-platform-tests/clipboard-apis/async-write-blobs-read-blobs-manual.https.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <meta charset="utf-8">
 <title>
   Async Clipboard write blobs -> read blobs tests
diff --git a/tests/wpt/web-platform-tests/clipboard-apis/async-write-image-read-image-manual.https.html b/tests/wpt/web-platform-tests/clipboard-apis/async-write-image-read-image-manual.https.html
index 6381b453abf..71d14984953 100644
--- a/tests/wpt/web-platform-tests/clipboard-apis/async-write-image-read-image-manual.https.html
+++ b/tests/wpt/web-platform-tests/clipboard-apis/async-write-image-read-image-manual.https.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <meta charset="utf-8">
 <title>
   Async Clipboard write [image/png ClipboardItem] ->
diff --git a/tests/wpt/web-platform-tests/clipboard-apis/clipboard-events-synthetic.html b/tests/wpt/web-platform-tests/clipboard-apis/clipboard-events-synthetic.html
index fa40d8c2003..87868297526 100644
--- a/tests/wpt/web-platform-tests/clipboard-apis/clipboard-events-synthetic.html
+++ b/tests/wpt/web-platform-tests/clipboard-apis/clipboard-events-synthetic.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <title>synthetic clipboard events should not be composed</title>
 <link rel="help" href="https://w3c.github.io/clipboard-apis/#clipboard-event-copy">
 <link rel="help" href="https://w3c.github.io/clipboard-apis/#clipboard-event-cut">
diff --git a/tests/wpt/web-platform-tests/clipboard-apis/clipboard-item.https.html b/tests/wpt/web-platform-tests/clipboard-apis/clipboard-item.https.html
index d9dcee76419..afec778eb99 100644
--- a/tests/wpt/web-platform-tests/clipboard-apis/clipboard-item.https.html
+++ b/tests/wpt/web-platform-tests/clipboard-apis/clipboard-item.https.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <meta charset="utf-8">
 <title>ClipboardItem tests</title>
 <link rel="help" href="https://w3c.github.io/clipboard-apis/#async-clipboard-api">
diff --git a/tests/wpt/web-platform-tests/clipboard-apis/detached-iframe/clipboard-on-detached-iframe.https.html b/tests/wpt/web-platform-tests/clipboard-apis/detached-iframe/clipboard-on-detached-iframe.https.html
index 9b43b3695af..84fce803236 100644
--- a/tests/wpt/web-platform-tests/clipboard-apis/detached-iframe/clipboard-on-detached-iframe.https.html
+++ b/tests/wpt/web-platform-tests/clipboard-apis/detached-iframe/clipboard-on-detached-iframe.https.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <meta charset=utf-8>
 <title>Clipboard API on detached iframe</title>
 <link rel='help' href='https://w3c.github.io/clipboard-apis/#async-clipboard-api'>
diff --git a/tests/wpt/web-platform-tests/clipboard-apis/detached-iframe/read-on-detaching-iframe-manual.https.html b/tests/wpt/web-platform-tests/clipboard-apis/detached-iframe/read-on-detaching-iframe-manual.https.html
index e4a4283c900..8361ceff125 100644
--- a/tests/wpt/web-platform-tests/clipboard-apis/detached-iframe/read-on-detaching-iframe-manual.https.html
+++ b/tests/wpt/web-platform-tests/clipboard-apis/detached-iframe/read-on-detaching-iframe-manual.https.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <meta charset=utf-8>
 <title>navigator.clipboard read on detaching iframe</title>
 <link rel='help' href='https://w3c.github.io/clipboard-apis/#async-clipboard-api'>
diff --git a/tests/wpt/web-platform-tests/clipboard-apis/detached-iframe/write-on-detaching-iframe-manual.https.html b/tests/wpt/web-platform-tests/clipboard-apis/detached-iframe/write-on-detaching-iframe-manual.https.html
index 033cc0fd9f1..4a3dbd7dc32 100644
--- a/tests/wpt/web-platform-tests/clipboard-apis/detached-iframe/write-on-detaching-iframe-manual.https.html
+++ b/tests/wpt/web-platform-tests/clipboard-apis/detached-iframe/write-on-detaching-iframe-manual.https.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <meta charset=utf-8>
 <title>navigator.clipboard write on detaching iframe</title>
 <link rel='help' href='https://w3c.github.io/clipboard-apis/#async-clipboard-api'>
diff --git a/tests/wpt/web-platform-tests/clipboard-apis/detached-iframe/write-read-on-detached-iframe-manual.https.html b/tests/wpt/web-platform-tests/clipboard-apis/detached-iframe/write-read-on-detached-iframe-manual.https.html
index 31168092480..af12ff8d880 100644
--- a/tests/wpt/web-platform-tests/clipboard-apis/detached-iframe/write-read-on-detached-iframe-manual.https.html
+++ b/tests/wpt/web-platform-tests/clipboard-apis/detached-iframe/write-read-on-detached-iframe-manual.https.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <meta charset=utf-8>
 <title>navigator.clipboard read and write on detached iframe</title>
 <link rel='help' href='https://w3c.github.io/clipboard-apis/#async-clipboard-api'>
diff --git a/tests/wpt/web-platform-tests/clipboard-apis/detached-iframe/writeText-readText-on-detached-iframe-manual.https.html b/tests/wpt/web-platform-tests/clipboard-apis/detached-iframe/writeText-readText-on-detached-iframe-manual.https.html
index 883e8dbd32e..c2d8be1ace2 100644
--- a/tests/wpt/web-platform-tests/clipboard-apis/detached-iframe/writeText-readText-on-detached-iframe-manual.https.html
+++ b/tests/wpt/web-platform-tests/clipboard-apis/detached-iframe/writeText-readText-on-detached-iframe-manual.https.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <meta charset=utf-8>
 <title>navigator.clipboard readText and writeText on detached iframe</title>
 <link rel='help' href='https://w3c.github.io/clipboard-apis/#async-clipboard-api'>
diff --git a/tests/wpt/web-platform-tests/clipboard-apis/events/copy-event-manual.html b/tests/wpt/web-platform-tests/clipboard-apis/events/copy-event-manual.html
index 6f687af196f..9f9f1950e7c 100644
--- a/tests/wpt/web-platform-tests/clipboard-apis/events/copy-event-manual.html
+++ b/tests/wpt/web-platform-tests/clipboard-apis/events/copy-event-manual.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <title>The copy event</title>
 <link rel="help" href="https://w3c.github.io/clipboard-apis/#clipboard-event-copy">
 <script src="/resources/testharness.js"></script>
diff --git a/tests/wpt/web-platform-tests/clipboard-apis/events/cut-event-manual.html b/tests/wpt/web-platform-tests/clipboard-apis/events/cut-event-manual.html
index c5593171754..72c11ec3b98 100644
--- a/tests/wpt/web-platform-tests/clipboard-apis/events/cut-event-manual.html
+++ b/tests/wpt/web-platform-tests/clipboard-apis/events/cut-event-manual.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <title>The cut event</title>
 <link rel="help" href="https://w3c.github.io/clipboard-apis/#clipboard-event-cut">
 <script src="/resources/testharness.js"></script>
diff --git a/tests/wpt/web-platform-tests/clipboard-apis/events/paste-event-manual.html b/tests/wpt/web-platform-tests/clipboard-apis/events/paste-event-manual.html
index 19e6b95c5f3..608a0d6f232 100644
--- a/tests/wpt/web-platform-tests/clipboard-apis/events/paste-event-manual.html
+++ b/tests/wpt/web-platform-tests/clipboard-apis/events/paste-event-manual.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <title>The paste event</title>
 <link rel="help" href="https://w3c.github.io/clipboard-apis/#clipboard-event-paste">
 <script src="/resources/testharness.js"></script>
diff --git a/tests/wpt/web-platform-tests/clipboard-apis/text-write-read/async-write-read-manual.https.html b/tests/wpt/web-platform-tests/clipboard-apis/text-write-read/async-write-read-manual.https.html
index b374333ca94..14488b1e716 100644
--- a/tests/wpt/web-platform-tests/clipboard-apis/text-write-read/async-write-read-manual.https.html
+++ b/tests/wpt/web-platform-tests/clipboard-apis/text-write-read/async-write-read-manual.https.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <meta charset="utf-8">
 <title>
   Async Clipboard write ([text/plain ClipboardItem]) ->
diff --git a/tests/wpt/web-platform-tests/clipboard-apis/text-write-read/async-write-readText-manual.https.html b/tests/wpt/web-platform-tests/clipboard-apis/text-write-read/async-write-readText-manual.https.html
index 2d78b2f186e..c76df06a8b0 100644
--- a/tests/wpt/web-platform-tests/clipboard-apis/text-write-read/async-write-readText-manual.https.html
+++ b/tests/wpt/web-platform-tests/clipboard-apis/text-write-read/async-write-readText-manual.https.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <meta charset="utf-8">
 <title>
   Async Clipboard write ([text/plain ClipboardItem]) -> readText tests
diff --git a/tests/wpt/web-platform-tests/clipboard-apis/text-write-read/async-writeText-read-manual.https.html b/tests/wpt/web-platform-tests/clipboard-apis/text-write-read/async-writeText-read-manual.https.html
index 4f9fe25bca5..e74726ec5e7 100644
--- a/tests/wpt/web-platform-tests/clipboard-apis/text-write-read/async-writeText-read-manual.https.html
+++ b/tests/wpt/web-platform-tests/clipboard-apis/text-write-read/async-writeText-read-manual.https.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <meta charset="utf-8">
 <title>
   Async Clipboard writeText -> read ([text/plain ClipboardItem]) tests
diff --git a/tests/wpt/web-platform-tests/clipboard-apis/text-write-read/async-writeText-readText-manual.https.html b/tests/wpt/web-platform-tests/clipboard-apis/text-write-read/async-writeText-readText-manual.https.html
index 48e5adb51d2..d2c43f0b6f2 100644
--- a/tests/wpt/web-platform-tests/clipboard-apis/text-write-read/async-writeText-readText-manual.https.html
+++ b/tests/wpt/web-platform-tests/clipboard-apis/text-write-read/async-writeText-readText-manual.https.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <meta charset="utf-8">
 <title>Async Clipboard writeText -> readText tests</title>
 <link rel="help" href="https://w3c.github.io/clipboard-apis/#async-clipboard-api">
diff --git a/tests/wpt/web-platform-tests/content-security-policy/nonce-hiding/nonces.html b/tests/wpt/web-platform-tests/content-security-policy/nonce-hiding/nonces.html
index e7bada96f94..b023d060323 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/nonce-hiding/nonces.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/nonce-hiding/nonces.html
@@ -7,7 +7,7 @@
  ["div", ""],
  ["script", ""],
  ["meh", "http://www.w3.org/2000/svg"],
- ["svg", "http://www.w3.org/2000/svg"], ,
+ ["svg", "http://www.w3.org/2000/svg"],
  ["script", "http://www.w3.org/2000/svg"]].forEach(([localName, namespace]) => {
   test(t => {
     const element = namespace === "" ? document.createElement(localName) : document.createElementNS(namespace, localName);
diff --git a/tests/wpt/web-platform-tests/content-security-policy/nonce-hiding/script-nonces-hidden.html b/tests/wpt/web-platform-tests/content-security-policy/nonce-hiding/script-nonces-hidden.html
index b32635ff658..d9718d904c2 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/nonce-hiding/script-nonces-hidden.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/nonce-hiding/script-nonces-hidden.html
@@ -149,10 +149,10 @@
 <nonce-element nonce="abc"></nonce-element>
 <script nonce="abc">
   test(t => {
+    assert_object_equals(eventList[0], { type: "AttributeChanged", name: "nonce", oldValue: null, newValue: "abc" }, "AttributeChanged 1");
+    assert_object_equals(eventList[1], { type: "Connected" }, "Connected");
+    assert_object_equals(eventList[2], { type: "AttributeChanged", name: "nonce", oldValue: "abc", newValue: "" }, "AttributeChanged 2");
     assert_equals(eventList.length, 3);
-    assert_object_equals(eventList[0], { type: "AttributeChanged", name: "nonce", oldValue: null, newValue: "abc" });
-    assert_object_equals(eventList[1], { type: "Connected" });
-    assert_object_equals(eventList[2], { type: "AttributeChanged", name: "nonce", oldValue: "abc", newValue: "" });
   }, "Custom elements expose the correct events.");
 </script>
 
diff --git a/tests/wpt/web-platform-tests/content-security-policy/nonce-hiding/svgscript-nonces-hidden-meta.sub.html b/tests/wpt/web-platform-tests/content-security-policy/nonce-hiding/svgscript-nonces-hidden-meta.sub.html
index 0bdf2ab8f48..870fef316ea 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/nonce-hiding/svgscript-nonces-hidden-meta.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/nonce-hiding/svgscript-nonces-hidden-meta.sub.html
@@ -49,7 +49,7 @@
     test(t => {
       script.setAttribute('nonce', 'foo');
       assert_equals(script.getAttribute('nonce'), 'foo');
-      assert_equals(script.nonce, 'abc');
+      assert_equals(script.nonce, 'foo');
     }, "Writing 'nonce' content attribute.");
 
     // Set the IDL attribute to 'bar'
@@ -77,6 +77,8 @@
       innerScript.innerText = script.innerText;
       innerScript.nonce = 'abc';
       s.appendChild(innerScript);
+      assert_equals(innerScript.nonce, 'abc');
+      assert_equals(innerScript.getAttribute('nonce'), null, 'innerScript.getAttribute nonce');
       document.body.appendChild(s);
       assert_equals(innerScript.nonce, 'abc');
       assert_equals(innerScript.getAttribute('nonce'), null, 'innerScript.getAttribute nonce');
diff --git a/tests/wpt/web-platform-tests/content-security-policy/nonce-hiding/svgscript-nonces-hidden.html b/tests/wpt/web-platform-tests/content-security-policy/nonce-hiding/svgscript-nonces-hidden.html
index d6e9379d471..a50c75b34ca 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/nonce-hiding/svgscript-nonces-hidden.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/nonce-hiding/svgscript-nonces-hidden.html
@@ -49,7 +49,7 @@
     test(t => {
       script.setAttribute('nonce', 'foo');
       assert_equals(script.getAttribute('nonce'), 'foo');
-      assert_equals(script.nonce, 'abc');
+      assert_equals(script.nonce, 'foo');
     }, "Writing 'nonce' content attribute.");
 
     // Set the IDL attribute to 'bar'
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/padding-overflow-crash.html b/tests/wpt/web-platform-tests/css/css-flexbox/padding-overflow-crash.html
new file mode 100644
index 00000000000..fd0c333faba
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/padding-overflow-crash.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<link rel="author" title="David Grogan" href="mailto:dgrogan@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#layout-algorithm">
+<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+<meta name="assert" content="Item's size includes padding even when there is overflow:hidden. Chrome crashed on this.">
+<p>Test passes if there is a filled green square only.</p>
+
+<div style="display: flex">
+  <div style="padding: 50px; background: green; overflow: hidden;"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-004-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-004-ref.html
index ffb44a82b53..7c1e5858130 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-004-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-004-ref.html
@@ -7,7 +7,7 @@
 #outer {
   height: 10em;
   display: inline-block;
-  background: green;
+  background: tan;
   vertical-align: top;
 }
 
@@ -18,11 +18,14 @@
 
 #inner {
   width: 200px;
+  height: 100%;
+  background: green;
 }
 
 #outer2 {
   height: 10em;
   display: inline-block;
+  background: tan;
 }
 
 #middle2 {
@@ -37,7 +40,8 @@
 }
 </style>
 
-<p>You should not see red nor a vertical scrollbar</p>
+<p>You should not see tan (except perhaps as the background of a horizontal
+   scrollbar), and you should not see a vertical scrollbar.</p>
 
 <div id="outer">
   <div id="middle">
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-004.html b/tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-004.html
index 4f162487a71..3fb0806b63d 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-004.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-004.html
@@ -9,7 +9,7 @@
 #outer {
   height: 10em;
   display: inline-flex;
-  background: red;
+  background: tan;
 }
 
 #middle {
@@ -17,8 +17,8 @@
 }
 
 #inner {
-  height: 100%;
   width: 200px;
+  height: 100%;
   background: green;
 }
 
@@ -26,7 +26,7 @@
   height: 10em;
   display: inline-flex;
   flex-direction: column;
-  background: red;
+  background: tan;
 }
 
 #middle2 {
@@ -35,13 +35,14 @@
 }
 
 #inner2 {
-  height: 100%;
   width: 200px;
+  height: 100%;
   background: green;
 }
 </style>
 
-<p>You should not see red nor a vertical scrollbar</p>
+<p>You should not see tan (except perhaps as the background of a horizontal
+   scrollbar), and you should not see a vertical scrollbar.</p>
 
 <div id="outer">
   <div id="middle">
diff --git a/tests/wpt/web-platform-tests/css/css-page/page-size-011.xht b/tests/wpt/web-platform-tests/css/css-page/page-size-011.xht
new file mode 100644
index 00000000000..6c9e3bcb11e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-page/page-size-011.xht
@@ -0,0 +1,20 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+  <title>CSS Test: @page size JIS-B5</title>
+  <link rel="author" title="Felipe Erias Morandeira" href="mailto:felipeerias@gmail.com"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#typedef-page-size-page-size"/>
+  <meta name="flags" content="paged" />
+  <meta name="assert" content="The 'JIS-B5' value of the 'size' property specifies that the page box's width be 182mm and its height 257mm."/>
+  <style type="text/css"><![CDATA[
+	@page {
+		size: JIS-B5;
+		border: 2pt solid black;
+		margin: 20mm;
+	}
+  ]]></style>
+ </head>
+ <body>
+  <div>If JIS B5 (182mm x 257mm) or larger paper is available, this content should be printed in a black box that has a width of 142mm and a height of 217mm.</div>
+ </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-page/page-size-012.xht b/tests/wpt/web-platform-tests/css/css-page/page-size-012.xht
new file mode 100644
index 00000000000..0def30ae455
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-page/page-size-012.xht
@@ -0,0 +1,20 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+  <title>CSS Test: @page size JIS-B4</title>
+  <link rel="author" title="Felipe Erias Morandeira" href="mailto:felipeerias@gmail.com"/>
+  <link rel="help" href="https://www.w3.org/TR/css-page-3/#typedef-page-size-page-size"/>
+  <meta name="flags" content="paged" />
+  <meta name="assert" content="The 'JIS-B4' value of the 'size' property specifies that the page box's width be 257mm and its height 364mm."/>
+  <style type="text/css"><![CDATA[
+	@page {
+		size: JIS-B4;
+		border: 2pt solid black;
+		margin: 20mm;
+	}
+  ]]></style>
+ </head>
+ <body>
+  <div>If JIS B4 (257mm x 364mm) or larger paper is available, this content should be printed in a black box that has a width of 217mm and a height of 324mm.</div>
+ </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-skip-ink-005-notref.html b/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-skip-ink-005-notref.html
new file mode 100644
index 00000000000..9cbee037c0e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-decoration-skip-ink-005-notref.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <title>Reference file for text-decoration-skip-ink test</title>
+        <style>
+         div{
+             font: 50px sans-serif;
+             color: #00008080;
+             letter-spacing: 10px;
+             text-decoration: green underline;
+             text-underline-offset: -3px;
+             text-decoration-thickness: 3px;
+             text-decoration-skip-ink: none;
+         }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if the underline skips the glyphs in the text below</p>
+        <div>中文</div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-ink-005.html b/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-ink-005.html
new file mode 100644
index 00000000000..2d91f73e2ee
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-ink-005.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <title>Test case for text-decoration-skip-ink</title>
+        <meta name="assert" content="text-decoration-skip-ink: all causes skipping even for CJK">
+        <link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
+        <link rel="help" href="https://drafts.csswg.org/css-text-decor-4/#text-decoration-skip-ink-property">
+        <link rel="mismatch" href="reference/text-decoration-skip-ink-005-notref.html">
+        <style>
+         div{
+             font: 50px sans-serif;
+             color: #00008080;
+             letter-spacing: 10px;
+             /* make sure the underline clashes badly with the glyphs! */
+             text-decoration: green underline;
+             text-underline-offset: -3px;
+             text-decoration-thickness: 3px;
+             text-decoration-skip-ink: all;
+         }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if the underline skips the glyphs in the text below</p>
+        <div>中文</div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-ink.html b/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-ink.html
index cd6f7a049c6..2d6a5d3671f 100644
--- a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-ink.html
+++ b/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-skip-ink.html
@@ -24,8 +24,10 @@ function testTextDecorationSkipInk() {
                           "Text-decoration-skip-ink must allow setting the value auto.");
               assert_true(CSS.supports('text-decoration-skip-ink', "none"),
                           "Text-decoration-skip-ink must allow setting the value none.");
+              assert_true(CSS.supports('text-decoration-skip-ink', "all"),
+                          "Text-decoration-skip-ink must allow setting the value all.");
           },
-          'Property text-decoration-skip-ink must support values auto and none.')
+          'Property text-decoration-skip-ink must support values auto, none and all.')
 }
 
 testTextDecorationSkipInk();
diff --git a/tests/wpt/web-platform-tests/css/css-values/minmax-number-computed.html b/tests/wpt/web-platform-tests/css/css-values/minmax-number-computed.html
index c72c2766254..9a6e6142ea8 100644
--- a/tests/wpt/web-platform-tests/css/css-values/minmax-number-computed.html
+++ b/tests/wpt/web-platform-tests/css/css-values/minmax-number-computed.html
@@ -38,4 +38,8 @@ test_number_equals('calc(max(0.1, 0.2) * 2)', '0.4');
 test_number_equals('calc(max(0.1, 0.2) / 2)', '0.1');
 test_number_equals('calc(min(0.1, 0.2) + max(0.1, 0.05))', '0.2');
 test_number_equals('calc(min(0.1, 0.2) - max(0.1, 0.05))', '0');
+
+// Mixing floats and integers
+test_number_equals('min(0, 0.5)', '0');
+test_number_equals('max(0, 0.5)', '0.5');
 </script>
diff --git a/tests/wpt/web-platform-tests/css/cssom/CSSStyleSheet-constructable.html b/tests/wpt/web-platform-tests/css/cssom/CSSStyleSheet-constructable.html
index d196b3965a5..539075b47ef 100644
--- a/tests/wpt/web-platform-tests/css/cssom/CSSStyleSheet-constructable.html
+++ b/tests/wpt/web-platform-tests/css/cssom/CSSStyleSheet-constructable.html
@@ -120,7 +120,7 @@ function createAllSheetsPromise() {
   const greenSheet = new CSSStyleSheet();
   const redSheet = new CSSStyleSheet({media: "screen, print"});
   const blueSheet = new CSSStyleSheet({title: "Blue", disabled: true});
-  const whiteSheet = new CSSStyleSheet({title: "White", alternate: true});
+  const whiteSheet = new CSSStyleSheet({title: "White", disabled: true});
   const yellowSheet = new CSSStyleSheet({disabled: false});
 
   const greenPromise = greenSheet.replace(greenStyleText);
@@ -140,16 +140,17 @@ promise_test(() => {
     const yellowStyleSheet = values[4];
 
     // Lists of style sheets can be created, assigned and read.
+
+    // disabled stylesheets aren't applied
     document.adoptedStyleSheets = [whiteStyleSheet];
-    // alternate stylesheets aren't applied when title != current preferable name
     assert_equals(getComputedStyle(greenSpan).color, "rgb(0, 0, 0)");
     assert_equals(getComputedStyle(redSpan).color, "rgb(0, 0, 0)");
     assert_equals(getComputedStyle(blueSpan).color, "rgb(0, 0, 0)");
     assert_equals(getComputedStyle(whiteSpan).color, "rgb(0, 0, 0)");
     assert_equals(getComputedStyle(yellowSpan).color, "rgb(0, 0, 0)");
 
+    // disable dsheets don't block other styles from applying
     document.adoptedStyleSheets = [greenStyleSheet, blueStyleSheet];
-    // disabled stylesheets aren't applied
     assert_equals(getComputedStyle(greenSpan).color, "rgb(0, 128, 0)");
     assert_equals(getComputedStyle(redSpan).color, "rgb(0, 0, 0)");
     assert_equals(getComputedStyle(blueSpan).color, "rgb(0, 0, 0)");
@@ -170,6 +171,7 @@ promise_test(() => {
     assert_equals(getComputedStyle(blueSpan).color, "rgb(0, 0, 0)");
     assert_equals(getComputedStyle(whiteSpan).color, "rgb(255, 0, 0)");
     assert_equals(getComputedStyle(yellowSpan).color, "rgb(255, 255, 0)");
+    document.adoptedStyleSheets = [];
   });
 }, 'Constructed style sheets can be applied on document');
 
@@ -241,7 +243,6 @@ test(() => {
 }, 'Attaching a shadow root that already has adopted stylesheets work');
 
 test(() => {
-
   const sheet = new CSSStyleSheet();
   sheet.replaceSync(":host([red]) { color: red; } :host(.blue) { color: blue; }");
   const host = document.createElement("div");
@@ -327,7 +328,8 @@ promise_test(() => {
     assert_equals(getComputedStyle(blueShadowSpan).color, "rgb(0, 0, 0)");
     assert_equals(getComputedStyle(whiteShadowSpan).color, "rgb(255, 0, 0)");
     assert_equals(getComputedStyle(yellowShadowSpan).color, "rgb(0, 0, 0)");
-});
+    document.adoptedStyleSheets = [];
+  });
 }, 'Constructed stylesheet can be used and modified in multiple TreeScopes');
 
 promise_test(() => {
@@ -344,7 +346,11 @@ promise_test(() => {
   const plainSheet = new CSSStyleSheet();
   const redStyleSheetPromise = plainSheet.replace(redStyleTexts[0]);
   return redStyleSheetPromise.then(function(redStyleSheet) {
-    assert_throws_dom('NotAllowedError', () => { iframe.contentDocument.adoptedStyleSheets = [redStyleSheet]; });
+    assert_throws_dom(
+      'NotAllowedError',
+      iframe.contentWindow.DOMException,
+      () => { iframe.contentDocument.adoptedStyleSheets = [redStyleSheet]; }
+    );
     assert_equals(getComputedStyle(greenIframeSpan).color, "rgb(0, 0, 0)");
     assert_equals(getComputedStyle(redIframeSpan).color, "rgb(0, 0, 0)");
     assert_equals(getComputedStyle(blueIframeSpan).color, "rgb(0, 0, 0)");
@@ -367,9 +373,11 @@ promise_test(() => {
   });
 }, 'Stylesheets constructed on the main Document cannot be used in iframes');
 
-promise_test(() => {
+promise_test(async () => {
   const iframe = document.createElement("iframe");
+  const iframeLoaded = new Promise(resolve => iframe.addEventListener("load", resolve));
   document.body.appendChild(iframe);
+  await iframeLoaded;
   const thirdDiv = firstDiv.cloneNode(true);
   iframe.contentDocument.body.appendChild(thirdDiv);
   const greenIframeSpan = thirdDiv.children[0];
@@ -444,7 +452,9 @@ test(() => {
   iframe.contentDocument.body.appendChild(iframeDiv);
 
   assert_equals(getComputedStyle(iframeDiv).color, "rgb(0, 0, 0)");
-  assert_throws_dom('NotAllowedError', () => { iframe.contentDocument.adoptedStyleSheets = [nonConstructedStyleSheet]; });
+  assert_throws_dom('NotAllowedError', iframe.contentWindow.DOMException, () => {
+    iframe.contentDocument.adoptedStyleSheets = [nonConstructedStyleSheet];
+  });
   assert_equals(getComputedStyle(iframeDiv).color, "rgb(0, 0, 0)");
 
   iframeStyle = iframe.contentDocument.createElement("style");
@@ -623,14 +633,19 @@ promise_test(() => {
     assert_equals(sheet.cssRules.length, 1);
     assert_equals(sheet.cssRules[0].cssText, import_text);
     assert_equals(getComputedStyle(shadowDiv).color, "rgb(255, 0, 0)");
+  }).catch((reason) => {
+    assert_unreached(`Promise was rejected (${reason}) when it should have been resolved`);
   });
 }, 'CSSStyleSheet.replace allows import rule inside');
 
 promise_test(() => {
   const sheet = new CSSStyleSheet();
-  const sheet_promise = sheet.replace("import url('not-there.css');");
-  return sheet_promise.catch((reason) => {
-    assert_equals(reason.name, "NotAllowedError");
+  const sheet_promise = sheet.replace("@import url('not-there.css');");
+
+  return sheet_promise.then((sheet) => {
+    assert_unreached("Promise was resolved when it should have been rejected");
+  }).catch((reason) => {
+    assert_equals(reason.name, "NetworkError");
   });
 }, 'CSSStyleSheet.replace returns rejected promise on failed imports');
 
diff --git a/tests/wpt/web-platform-tests/css/selectors/attribute-selectors/attribute-case/syntax.html b/tests/wpt/web-platform-tests/css/selectors/attribute-selectors/attribute-case/syntax.html
index 0eda7374053..e62c13a0340 100644
--- a/tests/wpt/web-platform-tests/css/selectors/attribute-selectors/attribute-case/syntax.html
+++ b/tests/wpt/web-platform-tests/css/selectors/attribute-selectors/attribute-case/syntax.html
@@ -135,7 +135,7 @@ onload = function() {
         assert_equals(global.getComputedStyle(elm).visibility, 'visible', 'invalid selector matched');
       }, s + ' in ' + global.mode);
       test(function() {
-        assert_throws_dom("SyntaxError", function() {
+        assert_throws_dom("SyntaxError", global.DOMException, function() {
           global.document.querySelector(s);
         }, 'invalid selector');
       }, s + ' with querySelector in ' + global.mode);
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/check-for-references.sh b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/check-for-references.sh
index f5f68d5f578..adcc7dd2e7d 100755
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/check-for-references.sh
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/check-for-references.sh
@@ -3,7 +3,7 @@
 cd "$(dirname "$0")"
 find . -name reftest.list | sed 's,/reftest.list$,,' | while read DIRNAME
 do
-    cat "$DIRNAME/reftest.list" | grep -v -e "^default-preferences" -e "include " | sed 's/ #.*//;s/^#.*//;s/.* == /== /;s/.* != /!= /' | grep -v "^ *$" | while read TYPE TEST REF
+    cat "$DIRNAME/reftest.list" | grep -v -e "^defaults" -e "include " | sed 's/ #.*//;s/^#.*//;s/.* == /== /;s/.* != /!= /' | grep -v "^ *$" | while read TYPE TEST REF
     do
         REFTYPE=""
         if [ "$TYPE" == "==" ]
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/reftest.list b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/reftest.list
index 3dde877e231..1c5b5447c70 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/reftest.list
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/reftest.list
@@ -53,10 +53,3 @@
 == contain-layout-ignored-cases-no-principal-box-003.html contain-layout-ignored-cases-no-principal-box-003-ref.html
 == contain-layout-suppress-baseline-001.html contain-layout-suppress-baseline-001-ref.html
 == contain-layout-suppress-baseline-002.html contain-layout-suppress-baseline-002-ref.html
-
-# The following lines are duplicates of other lines from further up in this
-# manifest. They're listed again here so we can re-run these tests with
-# column-span enabled. These lines can be removed once the pref becomes
-# default-enabled (Bug 1426010).
-== contain-size-multicol-002.html contain-size-multicol-002-ref.html
-== contain-size-multicol-003.html contain-size-multicol-003-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/multicol3/reftest.list b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/multicol3/reftest.list
index 867a23079d7..35102af64b6 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/multicol3/reftest.list
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/multicol3/reftest.list
@@ -1,9 +1,3 @@
 == broken-column-rule-1.html broken-column-rule-1-ref.html
 == moz-multicol3-column-balancing-break-inside-avoid-1.html moz-multicol3-column-balancing-break-inside-avoid-1-ref.html
 == multicol-height-002.xht reference/multicol-height-002.xht
-
-# The following lines are duplicates of other lines from further up in this
-# manifest. They're listed again here so we can re-run these tests with
-# column-span enabled. These lines can be removed once the pref becomes
-# default-enabled (Bug 1426010).
-== broken-column-rule-1.html broken-column-rule-1-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sync-tests.sh b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sync-tests.sh
index 431ead2482e..7e3f087681e 100755
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sync-tests.sh
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sync-tests.sh
@@ -22,7 +22,7 @@ else
 fi
 
 rsync -avz --delete --filter=". ./sync-tests-filter" "$MOZTREE"/layout/reftests/w3c-css/submitted/ ./
-sed -i -e 's/^\(\(fails\|needs-focus\|random\|skip\|asserts\|slow\|require-or\|silentfail\|pref\|test-pref\|ref-pref\|fuzzy\)[^ ]* *\?\)\+//;/^default-preferences /d;s/ \?# \?\(TC: \)\?[bB]ug.*//' $(find . -name reftest.list)
+sed -i -e 's/^\(\(fails\|needs-focus\|random\|skip\|asserts\|slow\|require-or\|silentfail\|pref\|test-pref\|ref-pref\|fuzzy\)[^ ]* *\?\)\+//;/^defaults /d;s/ \?# \?\(TC: \)\?[bB]ug.*//' $(find . -name reftest.list)
 sed -i -e 's/-moz-crisp-edges/pixelated/g' $(find . -regex ".*\.\(xht\|xhtml\|html\|css\)")
 git add -A .
 git commit -m"Sync Mozilla CSS tests as of https://hg.mozilla.org/mozilla-central/rev/$MOZREV ." -e .
diff --git a/tests/wpt/web-platform-tests/custom-elements/custom-element-registry/define.html b/tests/wpt/web-platform-tests/custom-elements/custom-element-registry/define.html
index 61717b2e200..2aad1c18025 100644
--- a/tests/wpt/web-platform-tests/custom-elements/custom-element-registry/define.html
+++ b/tests/wpt/web-platform-tests/custom-elements/custom-element-registry/define.html
@@ -105,7 +105,7 @@
   });
   invalidCustomElementNames.forEach(name =>  {
     test(() =>  {
-      assert_throws_dom(expectSyntaxError, () =>  {
+      assert_throws_dom(expectSyntaxError, testWindow.DOMException, () =>  {
         customElements.define(name, class {});
       });
     }, `Element names: defining an element named ${name} should throw a SyntaxError`);
@@ -115,7 +115,7 @@
   // then throw a NotSupportedError and abort these steps.
   test(() =>  {
     customElements.define('test-define-dup-name', class {});
-    assert_throws_dom(expectNotSupportedError, () =>  {
+    assert_throws_dom(expectNotSupportedError, testWindow.DOMException, () =>  {
       customElements.define('test-define-dup-name', class {});
     });
   }, 'If the name is already defined, should throw a NotSupportedError');
@@ -125,7 +125,7 @@
   test(() =>  {
     class TestDupConstructor {};
     customElements.define('test-define-dup-constructor', TestDupConstructor);
-    assert_throws_dom(expectNotSupportedError, () =>  {
+    assert_throws_dom(expectNotSupportedError, testWindow.DOMException, () =>  {
       customElements.define('test-define-dup-ctor2', TestDupConstructor);
     });
   }, 'If the constructor is already defined, should throw a NotSupportedError');
@@ -134,7 +134,7 @@
   // then throw a NotSupportedError.
   validCustomElementNames.forEach(name =>  {
     test(() =>  {
-      assert_throws_dom(expectNotSupportedError, () =>  {
+      assert_throws_dom(expectNotSupportedError, testWindow.DOMException, () =>  {
         customElements.define('test-define-extend-valid-name', class {}, { extends: name });
       });
     }, `If extends is ${name}, should throw a NotSupportedError`);
@@ -154,7 +154,7 @@
     'elementnametobeunknownelement',
   ].forEach(name =>  {
     test(() =>  {
-      assert_throws_dom(expectNotSupportedError, () =>  {
+      assert_throws_dom(expectNotSupportedError, testWindow.DOMException, () =>  {
         customElements.define('test-define-extend-' + name, class {}, { extends: name });
       });
     }, `If extends is ${name}, should throw a NotSupportedError`);
diff --git a/tests/wpt/web-platform-tests/custom-elements/reactions/with-exceptions.html b/tests/wpt/web-platform-tests/custom-elements/reactions/with-exceptions.html
index e7cdee789d4..131348b1c41 100644
--- a/tests/wpt/web-platform-tests/custom-elements/reactions/with-exceptions.html
+++ b/tests/wpt/web-platform-tests/custom-elements/reactions/with-exceptions.html
@@ -25,7 +25,11 @@ test_with_window((contentWindow, contentDocument) => {
   contentDocument.documentElement.appendChild(text);
   const element = contentDocument.createElement("custom-element");
   contentDocument.documentElement.appendChild(element);
-  assert_throws_dom("HierarchyRequestError", () => text.before("", contentDocument.documentElement));
+  assert_throws_dom(
+    "HierarchyRequestError",
+    contentWindow.DOMException,
+    () => text.before("", contentDocument.documentElement)
+  );
   assert_true(reactionRan);
 }, "Reaction must run even after the exception is thrown");
 </script>
diff --git a/tests/wpt/web-platform-tests/custom-elements/throw-on-dynamic-markup-insertion-counter-construct.html b/tests/wpt/web-platform-tests/custom-elements/throw-on-dynamic-markup-insertion-counter-construct.html
index 85359504014..3e9254e2a50 100644
--- a/tests/wpt/web-platform-tests/custom-elements/throw-on-dynamic-markup-insertion-counter-construct.html
+++ b/tests/wpt/web-platform-tests/custom-elements/throw-on-dynamic-markup-insertion-counter-construct.html
@@ -45,12 +45,12 @@
 
  promise_test(async function () {
      const result = await construct_custom_element_in_parser(this, (document) => document.open());
-     assert_throws_dom('InvalidStateError', () => { throw result.exception; }, 'Must throw an InvalidStateError');
+     assert_throws_dom('InvalidStateError', result.window.DOMException, () => { throw result.exception; }, 'Must throw an InvalidStateError');
  }, 'document.open() must throw an InvalidStateError when synchronously constructing a custom element');
 
  promise_test(async function () {
      const result = await construct_custom_element_in_parser(this, (document) => document.open('text/html'));
-     assert_throws_dom('InvalidStateError', () => { throw result.exception; }, 'Must throw an InvalidStateError');
+     assert_throws_dom('InvalidStateError', result.window.DOMException, () => { throw result.exception; }, 'Must throw an InvalidStateError');
  }, 'document.open("text/html") must throw an InvalidStateError when synchronously constructing a custom element');
 
  // https://html.spec.whatwg.org/multipage/dynamic-markup-insertion.html#dom-document-open-window
@@ -63,19 +63,19 @@
 
  promise_test(async function () {
      const result = await construct_custom_element_in_parser(this, (document) => document.close());
-     assert_throws_dom('InvalidStateError', () => { throw result.exception; }, 'Must throw an InvalidStateError');
+     assert_throws_dom('InvalidStateError', result.window.DOMException, () => { throw result.exception; }, 'Must throw an InvalidStateError');
  }, 'document.close() must throw an InvalidStateError when synchronously constructing a custom element');
 
  promise_test(async function () {
      const result = await construct_custom_element_in_parser(this, (document) => document.write('<b>some text</b>'));
-     assert_throws_dom('InvalidStateError', () => { throw result.exception; }, 'Must throw an InvalidStateError');
+     assert_throws_dom('InvalidStateError', result.window.DOMException, () => { throw result.exception; }, 'Must throw an InvalidStateError');
      assert_equals(result.document.querySelector('b'), null, 'Must not insert new content');
      assert_false(result.document.documentElement.innerHTML.includes('some text'), 'Must not insert new content');
  }, 'document.write must throw an InvalidStateError when synchronously constructing a custom element');
 
  promise_test(async function () {
      const result = await construct_custom_element_in_parser(this, (document) => document.writeln('<b>some text</b>'));
-     assert_throws_dom('InvalidStateError', () => { throw result.exception; }, 'Must throw an InvalidStateError');
+     assert_throws_dom('InvalidStateError', result.window.DOMException, () => { throw result.exception; }, 'Must throw an InvalidStateError');
      assert_equals(result.document.querySelector('b'), null, 'Must not insert new content');
      assert_false(result.document.documentElement.innerHTML.includes('some text'), 'Must not insert new content');
  }, 'document.writeln must throw an InvalidStateError when synchronously constructing a custom element');
diff --git a/tests/wpt/web-platform-tests/custom-elements/throw-on-dynamic-markup-insertion-counter-reactions.html b/tests/wpt/web-platform-tests/custom-elements/throw-on-dynamic-markup-insertion-counter-reactions.html
index 49335bf9b42..e798d332e38 100644
--- a/tests/wpt/web-platform-tests/custom-elements/throw-on-dynamic-markup-insertion-counter-reactions.html
+++ b/tests/wpt/web-platform-tests/custom-elements/throw-on-dynamic-markup-insertion-counter-reactions.html
@@ -45,12 +45,12 @@ async function custom_element_reactions_in_parser(test, call_function)
 
 promise_test(async function () {
     const result = await custom_element_reactions_in_parser(this, (document) => document.open());
-    assert_throws_dom('InvalidStateError', () => { throw result.exception; }, 'Must throw an InvalidStateError');
+    assert_throws_dom('InvalidStateError', result.window.DOMException, () => { throw result.exception; }, 'Must throw an InvalidStateError');
 }, 'document.open() must throw an InvalidStateError when processing custom element reactions for a synchronous constructed custom element');
 
 promise_test(async function () {
     const result = await custom_element_reactions_in_parser(this, (document) => document.open('text/html'));
-    assert_throws_dom('InvalidStateError', () => { throw result.exception; }, 'Must throw an InvalidStateError');
+    assert_throws_dom('InvalidStateError', result.window.DOMException, () => { throw result.exception; }, 'Must throw an InvalidStateError');
 }, 'document.open("text/html") must throw an InvalidStateError when processing custom element reactions for a synchronous constructed custom element');
 
 // https://html.spec.whatwg.org/multipage/dynamic-markup-insertion.html#dom-document-open-window
@@ -63,19 +63,19 @@ promise_test(async function () {
 
 promise_test(async function () {
     const result = await custom_element_reactions_in_parser(this, (document) => document.close());
-    assert_throws_dom('InvalidStateError', () => { throw result.exception; }, 'Must throw an InvalidStateError');
+    assert_throws_dom('InvalidStateError', result.window.DOMException, () => { throw result.exception; }, 'Must throw an InvalidStateError');
 }, 'document.close() must throw an InvalidStateError when processing custom element reactions for a synchronous constructed custom element');
 
 promise_test(async function () {
     const result = await custom_element_reactions_in_parser(this, (document) => document.write('<b>some text</b>'));
-    assert_throws_dom('InvalidStateError', () => { throw result.exception; }, 'Must throw an InvalidStateError');
+    assert_throws_dom('InvalidStateError', result.window.DOMException, () => { throw result.exception; }, 'Must throw an InvalidStateError');
     assert_equals(result.document.querySelector('b'), null, 'Must not insert new content');
     assert_false(result.document.documentElement.innerHTML.includes('some text'), 'Must not insert new content');
 }, 'document.write must throw an InvalidStateError when processing custom element reactions for a synchronous constructed custom element');
 
 promise_test(async function () {
     const result = await custom_element_reactions_in_parser(this, (document) => document.writeln('<b>some text</b>'));
-    assert_throws_dom('InvalidStateError', () => { throw result.exception; }, 'Must throw an InvalidStateError');
+    assert_throws_dom('InvalidStateError', result.window.DOMException, () => { throw result.exception; }, 'Must throw an InvalidStateError');
     assert_equals(result.document.querySelector('b'), null, 'Must not insert new content');
     assert_false(result.document.documentElement.innerHTML.includes('some text'), 'Must not insert new content');
 }, 'document.writeln must throw an InvalidStateError when processing custom element reactions for a synchronous constructed custom element');
diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/testharness-api.md b/tests/wpt/web-platform-tests/docs/writing-tests/testharness-api.md
index d83ebc4e676..2ee52786add 100644
--- a/tests/wpt/web-platform-tests/docs/writing-tests/testharness-api.md
+++ b/tests/wpt/web-platform-tests/docs/writing-tests/testharness-api.md
@@ -206,7 +206,7 @@ promise_rejects_exactly(test_object, value, promise, description)
 
 The `code`, `constructor`, and `value` arguments are equivalent to the same
 argument to the `assert_throws_dom`, `assert_throws_js`, and
-`assert_throws_exactly` functions.
+`assert_throws_exactly` functions.  The `promise_rejects_dom` function can also be called with a DOMException constructor argument between the `code` and `promise` arguments, just like `assert_throws_dom`, when we want to assert that the DOMException comes from a non-default global.
 
 Here's an example where the `bar()` function returns a Promise that rejects
 with a TypeError:
@@ -858,7 +858,7 @@ attribute attribute_name following the conditions specified by WebIDL
 ### `assert_readonly(object, property_name, description)`
 assert that property `property_name` on object is readonly
 
-### `assert_throws_dom(code, func, description)`
+### `assert_throws_dom(code, func, description)` or `assert_throws_dom(code, constructor, func, description)`
 `code` - the expected exception. This can take several forms:
 
   * string - asserts that the thrown exception must be a DOMException
@@ -871,6 +871,8 @@ assert that property `property_name` on object is readonly
 
 `func` - a function that should throw
 
+`constructor` - The DOMException constructor that the resulting DOMException should have as its `.constructor`.  This should be used when a DOMException from a non-default global is expected to be thrown.
+
 ### `assert_throws_js(constructor, func, description)`
 `constructor` - the expected exception. This is the constructor object
 that the exception should have as its .constructor.  For example,
diff --git a/tests/wpt/web-platform-tests/dom/events/scrolling/overscroll-deltas.html b/tests/wpt/web-platform-tests/dom/events/scrolling/overscroll-deltas.html
index 287987c3ee2..091cfd0631b 100644
--- a/tests/wpt/web-platform-tests/dom/events/scrolling/overscroll-deltas.html
+++ b/tests/wpt/web-platform-tests/dom/events/scrolling/overscroll-deltas.html
@@ -47,7 +47,7 @@ function runTest() {
         'Document did not receive scrollend event.');
 
     assert_greater_than(overscrolled_y_deltas.length, 0, "There should be at least one overscroll events when overscrolling.");
-    assert_equals(Math.max(...overscrolled_x_deltas), 0, "The deltaX attribute must be 0 when there is no scrolling in x direction.");
+    assert_equals(overscrolled_x_deltas.filter(function(x){ return x!=0; }).length, 0, "The deltaX attribute must be 0 when there is no scrolling in x direction.");
     assert_less_than_equal(Math.max(...overscrolled_y_deltas), 0, "The deltaY attribute must be <= 0 when there is overscrolling in up direction.");
     assert_less_than_equal(Math.min(...overscrolled_y_deltas),-100, "The deltaY attribute must be the number of pixels overscrolled.");
 
@@ -62,7 +62,7 @@ function runTest() {
         'Document did not receive scrollend event.');
 
     assert_greater_than(overscrolled_y_deltas.length, 0, "There should be at least one overscroll events when overscrolling.");
-    assert_equals(Math.max(...overscrolled_y_deltas), 0, "The deltaY attribute must be 0 when there is no scrolling in y direction.");
+    assert_equals(overscrolled_y_deltas.filter(function(x){ return x!=0; }).length, 0, "The deltaY attribute must be 0 when there is no scrolling in y direction.");
     assert_less_than_equal(Math.max(...overscrolled_x_deltas), 0, "The deltaX attribute must be <= 0 when there is overscrolling in left direction.");
     assert_less_than_equal(Math.min(...overscrolled_x_deltas),-100, "The deltaX attribute must be the number of pixels overscrolled.");
 
diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement.html b/tests/wpt/web-platform-tests/dom/nodes/Document-createElement.html
index c0126b4f8a8..93435ac82d6 100644
--- a/tests/wpt/web-platform-tests/dom/nodes/Document-createElement.html
+++ b/tests/wpt/web-platform-tests/dom/nodes/Document-createElement.html
@@ -145,8 +145,9 @@ invalid.forEach(function(arg) {
     async_test(function(testObj) {
       window.addEventListener("load", function() {
         testObj.step(function() {
-          var doc = getWin(desc).document;
-          assert_throws_dom("InvalidCharacterError",
+          let win = getWin(desc);
+          let doc = win.document;
+          assert_throws_dom("InvalidCharacterError", win.DOMException,
                             function() { doc.createElement(arg) })
         });
         testObj.done();
diff --git a/tests/wpt/web-platform-tests/dom/nodes/Document-createElementNS.html b/tests/wpt/web-platform-tests/dom/nodes/Document-createElementNS.html
index 43cf800b4cc..5ad81043de0 100644
--- a/tests/wpt/web-platform-tests/dom/nodes/Document-createElementNS.html
+++ b/tests/wpt/web-platform-tests/dom/nodes/Document-createElementNS.html
@@ -50,7 +50,7 @@ function runTest(t, i, desc) {
         }
         var namespace = t[0], qualifiedName = t[1], expected = t[2]
         if (expected != null) {
-          assert_throws_dom(expected, function() { doc.createElementNS(namespace, qualifiedName) })
+          assert_throws_dom(expected, doc.defaultView.DOMException, function() {doc.createElementNS(namespace, qualifiedName) });
         } else {
           var element = doc.createElementNS(namespace, qualifiedName)
           assert_not_equals(element, null)
diff --git a/tests/wpt/web-platform-tests/dom/nodes/Element-matches.js b/tests/wpt/web-platform-tests/dom/nodes/Element-matches.js
index 9494f6f0eac..a1455c671f7 100644
--- a/tests/wpt/web-platform-tests/dom/nodes/Element-matches.js
+++ b/tests/wpt/web-platform-tests/dom/nodes/Element-matches.js
@@ -49,9 +49,13 @@ function runInvalidSelectorTestMatches(method, type, root, selectors) {
       var q = s["selector"];
 
       test(function() {
-        assert_throws_dom("SyntaxError", function() {
-          root[method](q)
-        })
+        assert_throws_dom(
+          "SyntaxError",
+          root.ownerDocument.defaultView.DOMException,
+          function() {
+            root[method](q)
+          }
+        );
       }, type + "." + method + ": " + n + ": " + q);
     }
   }
diff --git a/tests/wpt/web-platform-tests/dom/nodes/Node-removeChild.html b/tests/wpt/web-platform-tests/dom/nodes/Node-removeChild.html
index a4581aadc9b..6158423359c 100644
--- a/tests/wpt/web-platform-tests/dom/nodes/Node-removeChild.html
+++ b/tests/wpt/web-platform-tests/dom/nodes/Node-removeChild.html
@@ -41,7 +41,11 @@ documents.forEach(function(d) {
       var s = doc[creator]("test")
       doc.body.appendChild(s)
       assert_equals(s.ownerDocument, doc)
-      assert_throws_dom("NOT_FOUND_ERR", function() { s.removeChild(doc) })
+      assert_throws_dom(
+        "NOT_FOUND_ERR",
+        (doc.defaultView || self).DOMException,
+        function() { s.removeChild(doc) }
+      );
     }, "Calling removeChild on a " + p + " from " + description +
        " with no children should throw NOT_FOUND_ERR.")
   }
diff --git a/tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelector-All.js b/tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelector-All.js
index 3d424f750b9..3c6c5031798 100644
--- a/tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelector-All.js
+++ b/tests/wpt/web-platform-tests/dom/nodes/ParentNode-querySelector-All.js
@@ -207,6 +207,10 @@ function runValidSelectorTest(type, root, selectors, testType, docType) {
   }
 }
 
+function windowFor(root) {
+  return root.defaultView || root.ownerDocument.defaultView;
+}
+
 /*
  * Execute queries with the specified invalid selectors for both querySelector() and querySelectorAll()
  * Only run these tests when errors are expected. Don't run for valid selector tests.
@@ -218,15 +222,15 @@ function runInvalidSelectorTest(type, root, selectors) {
     var q = s["selector"];
 
     test(function() {
-      assert_throws_dom("SyntaxError", function() {
+      assert_throws_dom("SyntaxError", windowFor(root).DOMException, function() {
         root.querySelector(q)
-      })
+      });
     }, type + ".querySelector: " + n + ": " + q);
 
     test(function() {
-      assert_throws_dom("SyntaxError", function() {
+      assert_throws_dom("SyntaxError", windowFor(root).DOMException, function() {
         root.querySelectorAll(q)
-      })
+      });
     }, type + ".querySelectorAll: " + n + ": " + q);
   }
 }
diff --git a/tests/wpt/web-platform-tests/dom/nodes/aria-attribute-reflection.tentative.html b/tests/wpt/web-platform-tests/dom/nodes/aria-attribute-reflection.tentative.html
index 0a3a66bdf43..d5f4adff59f 100644
--- a/tests/wpt/web-platform-tests/dom/nodes/aria-attribute-reflection.tentative.html
+++ b/tests/wpt/web-platform-tests/dom/nodes/aria-attribute-reflection.tentative.html
@@ -109,6 +109,17 @@ test(function(t) {
 
 <div id="disabled" aria-disabled="true"></div>
 
+<div id="description" aria-description="cold as ice"></div>
+
+<script>
+test(function(t) {
+    var element = document.getElementById("description");
+    assert_equals(element.ariaDescription, "cold as ice");
+    element.ariaDescription = "hot as fire";
+    assert_equals(element.getAttribute("aria-description"), "hot as fire");
+}, "aria-description attribute reflects.");
+</script>
+
 <script>
 test(function(t) {
     var element = document.getElementById("disabled");
diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-cloneContents.html b/tests/wpt/web-platform-tests/dom/ranges/Range-cloneContents.html
index 73bce345725..6064151f62d 100644
--- a/tests/wpt/web-platform-tests/dom/ranges/Range-cloneContents.html
+++ b/tests/wpt/web-platform-tests/dom/ranges/Range-cloneContents.html
@@ -312,9 +312,13 @@ function testCloneContents(i) {
 
     expectedFrag = myCloneContents(expectedRange);
     if (typeof expectedFrag == "string") {
-      assert_throws_dom(expectedFrag, function() {
-        actualRange.cloneContents();
-      });
+      assert_throws_dom(
+        expectedFrag,
+        actualIframe.contentWindow.DOMException,
+        function() {
+          actualRange.cloneContents();
+        }
+      );
     } else {
       actualFrag = actualRange.cloneContents();
     }
diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-extractContents.html b/tests/wpt/web-platform-tests/dom/ranges/Range-extractContents.html
index b43769ebc01..88f8fa55f86 100644
--- a/tests/wpt/web-platform-tests/dom/ranges/Range-extractContents.html
+++ b/tests/wpt/web-platform-tests/dom/ranges/Range-extractContents.html
@@ -95,9 +95,13 @@ function testExtractContents(i) {
 
     expectedFrag = myExtractContents(expectedRange);
     if (typeof expectedFrag == "string") {
-      assert_throws_dom(expectedFrag, function() {
-        actualRange.extractContents();
-      });
+      assert_throws_dom(
+        expectedFrag,
+        actualIframe.contentWindow.DOMException,
+        function() {
+          actualRange.extractContents();
+        }
+      );
     } else {
       actualFrag = actualRange.extractContents();
     }
diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-insertNode.html b/tests/wpt/web-platform-tests/dom/ranges/Range-insertNode.html
index aca3a23ff5d..04727dbc4d2 100644
--- a/tests/wpt/web-platform-tests/dom/ranges/Range-insertNode.html
+++ b/tests/wpt/web-platform-tests/dom/ranges/Range-insertNode.html
@@ -138,7 +138,7 @@ function testInsertNode(i, j) {
             throw e;
         }
         if (typeof result == "string") {
-            assert_throws_dom(result, function() {
+            assert_throws_dom(result, actualIframe.contentWindow.DOMException, function() {
                 try {
                     actualRange.insertNode(actualNode);
                 } catch (e) {
diff --git a/tests/wpt/web-platform-tests/dom/ranges/Range-surroundContents.html b/tests/wpt/web-platform-tests/dom/ranges/Range-surroundContents.html
index c4ff0509f8f..c1ed30d0053 100644
--- a/tests/wpt/web-platform-tests/dom/ranges/Range-surroundContents.html
+++ b/tests/wpt/web-platform-tests/dom/ranges/Range-surroundContents.html
@@ -181,7 +181,7 @@ function testSurroundContents(i, j) {
       throw e;
     }
     if (typeof result == "string") {
-      assert_throws_dom(result, function() {
+      assert_throws_dom(result, actualIframe.contentWindow.DOMException, function() {
         try {
           actualRange.surroundContents(actualNode);
         } catch (e) {
diff --git a/tests/wpt/web-platform-tests/fetch/api/abort/serviceworker-intercepted.https.html b/tests/wpt/web-platform-tests/fetch/api/abort/serviceworker-intercepted.https.html
index 05eadefa4c8..603f29eac98 100644
--- a/tests/wpt/web-platform-tests/fetch/api/abort/serviceworker-intercepted.https.html
+++ b/tests/wpt/web-platform-tests/fetch/api/abort/serviceworker-intercepted.https.html
@@ -46,7 +46,7 @@
 
     const fetchPromise = w.fetch('data.json', { signal });
 
-    await promise_rejects_dom(t, "AbortError", fetchPromise);
+    await promise_rejects_dom(t, "AbortError", w.DOMException, fetchPromise);
 
     await w.fetch('data.json?no-abort');
 
@@ -76,7 +76,7 @@
         Promise.resolve().then(() => log.push('next-microtask'))
       ]);
 
-      await promise_rejects_dom(t, "AbortError", bodyPromise);
+      await promise_rejects_dom(t, "AbortError", w.DOMException, bodyPromise);
 
       assert_array_equals(log, [`${bodyMethod}-reject`, 'next-microtask']);
     }, `response.${bodyMethod}() rejects if already aborted`);
@@ -97,8 +97,8 @@
 
     controller.abort();
 
-    await promise_rejects_dom(t, "AbortError", reader.read());
-    await promise_rejects_dom(t, "AbortError", reader.closed);
+    await promise_rejects_dom(t, "AbortError", w.DOMException, reader.read());
+    await promise_rejects_dom(t, "AbortError", w.DOMException, reader.closed);
   }, "Stream errors once aborted.");
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/data-url-iframe.html b/tests/wpt/web-platform-tests/fetch/api/cors/data-url-iframe.html
new file mode 100644
index 00000000000..217baa3c46b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/api/cors/data-url-iframe.html
@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body></body>
+<script>
+
+const createDataUrlIframe = (url, cors) => {
+  const iframe = document.createElement("iframe");
+  const fetchURL = new URL(url, location.href) +
+      `${cors === 'null-origin'
+           ? '?pipe=header(Access-Control-Allow-Origin, null)' : ''}`;
+  const tag_name = 'script';
+  iframe.src =
+      `data:text/html, <${tag_name}>` +
+      `async function test() {` +
+      `  let allowed = true;` +
+      `  try {` +
+      `    await fetch('${fetchURL}');` +
+      `  } catch (e) {` +
+      `    allowed = false;` +
+      `  }` +
+      `  parent.postMessage({allowed}, '*');` +
+      `}` +
+      `test(); </${tag_name}>`;
+  return iframe;
+};
+
+const fetch_from_data_url_iframe_test =
+    (url, cors, expectation, description) => {
+  promise_test(async () => {
+    const iframe = createDataUrlIframe(url, cors);
+    document.body.appendChild(iframe);
+    const msgEvent = await new Promise(resolve => window.onmessage = resolve);
+    assert_equals(msgEvent.data.allowed ? 'allowed' : 'rejected', expectation);
+  }, description);
+};
+
+fetch_from_data_url_iframe_test(
+  '../resources/top.txt',
+  'acao-omitted',
+  'rejected',
+  'fetching "top.txt" without ACAO should be rejected.'
+);
+fetch_from_data_url_iframe_test(
+  '../resources/top.txt',
+  'null-origin',
+  'allowed',
+  'fetching "top.txt" with CORS allowing null origin should be allowed.'
+);
+fetch_from_data_url_iframe_test(
+  'data:text/plain, top',
+  'acao-omitted',
+  'allowed',
+  'fetching data url script should be allowed.'
+);
+
+</script>
diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/data-url-shared-worker.html b/tests/wpt/web-platform-tests/fetch/api/cors/data-url-shared-worker.html
new file mode 100644
index 00000000000..d69748ab261
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/api/cors/data-url-shared-worker.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+
+const fetch_from_data_url_worker_test =
+    (url, cors, expectation, description) => {
+  promise_test(async () => {
+    const fetchURL = new URL(url, location.href) +
+        `${cors === 'null-origin'
+             ? '?pipe=header(Access-Control-Allow-Origin, null)' : ''}`;
+    const scriptURL =
+      `data:text/javascript,` +
+      `async function test(port) {` +
+      `  let allowed = true;` +
+      `  try {` +
+      `    await fetch('${fetchURL}');` +
+      `  } catch (e) {` +
+      `    allowed = false;` +
+      `  }` +
+      `  port.postMessage({allowed});` +
+      `}` +
+      `onconnect = e => {` +
+      `  test(e.ports[0]);` +
+      `};`;
+    const worker = new SharedWorker(scriptURL);
+    const msgEvent =
+        await new Promise(resolve => worker.port.onmessage = resolve);
+    assert_equals(msgEvent.data.allowed ? 'allowed' : 'rejected', expectation);
+  }, description);
+};
+
+fetch_from_data_url_worker_test(
+  '../resources/top.txt',
+  'acao-omitted',
+  'rejected',
+  'fetching "top.txt" without ACAO should be rejected.'
+);
+fetch_from_data_url_worker_test(
+  '../resources/top.txt',
+  'null-origin',
+  'allowed',
+  'fetching "top.txt" with CORS allowing null origin should be allowed.'
+);
+fetch_from_data_url_worker_test(
+  'data:text/plain, top',
+  'acao-omitted',
+  'allowed',
+  'fetching data url script should be allowed.'
+);
+
+</script>
diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/data-url-worker.html b/tests/wpt/web-platform-tests/fetch/api/cors/data-url-worker.html
new file mode 100644
index 00000000000..13113e62621
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/api/cors/data-url-worker.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+
+const fetch_from_data_url_shared_worker_test =
+    (url, cors, expectation, description) => {
+  promise_test(async () => {
+    const fetchURL = new URL(url, location.href) +
+        `${cors === 'null-origin'
+             ? '?pipe=header(Access-Control-Allow-Origin, null)' : ''}`;
+    const scriptURL =
+      `data:text/javascript,` +
+      `async function test() {` +
+      `  let allowed = true;` +
+      `  try {` +
+      `    await fetch('${fetchURL}');` +
+      `  } catch (e) {` +
+      `    allowed = false;` +
+      `  }` +
+      `  postMessage({allowed});` +
+      `}` +
+      `test();`;
+    const worker = new Worker(scriptURL);
+    const msgEvent = await new Promise(resolve => worker.onmessage = resolve);
+    assert_equals(msgEvent.data.allowed ? 'allowed' : 'rejected', expectation);
+  }, description);
+};
+
+fetch_from_data_url_shared_worker_test(
+  '../resources/top.txt',
+  'acao-omitted',
+  'rejected',
+  'fetching "top.txt" without ACAO should be rejected.'
+);
+fetch_from_data_url_shared_worker_test(
+  '../resources/top.txt',
+  'null-origin',
+  'allowed',
+  'fetching "top.txt" with CORS allowing null origin should be allowed.'
+);
+fetch_from_data_url_shared_worker_test(
+  'data:text/plain, top',
+  'acao-omitted',
+  'allowed',
+  'fetching data url script should be allowed.'
+);
+
+</script>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-18-ref.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-18-ref.html
new file mode 100644
index 00000000000..a1701e3fdac
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-18-ref.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - svg.
+  Only foreignObject svg elements should have styles
+  overridden in forced colors mode.
+</title>
+<style>
+  svg, text, foreignObject {
+    forced-color-adjust: none;
+  }
+</style>
+<body>
+  <svg height="600" width="600">
+    <text x="0" y="15" fill="red" stroke="blue">
+      This text should have a red fill and blue stroke color in
+      forced colors mode.
+    </text>
+    <rect x="0" height="60" y="30" width="180" style="fill: red; stroke: blue;"/>
+    <foreignObject x="20" y="100" width="160" height="160">
+      <div xmlns="http://www.w3.org/1999/xhtml" style="color: orange;">
+        This text should be orange in forced colors mode due to inheritance.
+      </div>
+      <svg height="20" width="20">
+        <rect x="0" height="20" y="0" width="20" style="fill: green; stroke: purple;"/>
+      </svg>
+    </foreignObject>
+  </svg>
+
+  <svg height="600" width="600">
+    <foreignObject x="20" y="100" width="160" height="160" style="color: CanvasText;">
+      <div xmlns="http://www.w3.org/1999/xhtml">
+        This text should be CanvasText in forced colors mode.
+      </div>
+    </foreignObject>
+  </svg>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-18.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-18.html
new file mode 100644
index 00000000000..435b9e4326f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-18.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - svg.
+  Only foreignObject svg elements should have styles
+  overridden in forced colors mode.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<link rel=match href="forced-colors-mode-18-ref.html">
+<body>
+  <svg height="600" width="600" style="color: orange">
+    <text x="0" y="15" fill="red" stroke="blue">
+      This text should have a red fill and blue stroke color in
+      forced colors mode.
+    </text>
+    <rect x="0" height="60" y="30" width="180" style="fill: red; stroke: blue;"/>
+    <foreignObject x="20" y="100" width="160" height="160" style="color: blue;">
+      <div xmlns="http://www.w3.org/1999/xhtml">
+        This text should be orange in forced colors mode due to inheritance.
+      </div>
+      <svg height="20" width="20">
+        <rect x="0" height="20" y="0" width="20" style="fill: green; stroke: purple;"/>
+      </svg>
+    </foreignObject>
+  </svg>
+
+  <svg height="600" width="600">
+    <foreignObject x="20" y="100" width="160" height="160" style="color: blue;">
+      <div xmlns="http://www.w3.org/1999/xhtml">
+        This text should be CanvasText in forced colors mode.
+      </div>
+    </foreignObject>
+  </svg>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-18.tentative-ref.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-18.tentative-ref.html
deleted file mode 100644
index 34eba583caa..00000000000
--- a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-18.tentative-ref.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Forced colors mode - fill and stroke reference.
-  Only text and foreignObject svg elements should have fill and stroke
-  overridden in forced colors mode.
-</title>
-<style>
-  svg, text, foreignObject {
-    forced-color-adjust: none;
-  }
-</style>
-<body>
-  <svg height="600" width="600">
-    <text x="0" y="15" fill="WindowText">
-      This text should have a WindowText fill and transparent stroke color in
-      forced colors mode.
-    </text>
-    <rect x="0" height="60" y="30" width="180" style="fill: red; stroke: blue;"/>
-    <foreignObject x="20" y="100" width="160" height="160">
-      <div xmlns="http://www.w3.org/1999/xhtml" style="color: WindowText;">
-        This text should be WindowText color in forced colors mode.
-      </div>
-      <svg height="20" width="20">
-        <rect x="0" height="20" y="0" width="20" style="fill: green; stroke: purple;"/>
-      </svg>
-    </foreignObject>
-  </svg>
-</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-18.tentative.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-18.tentative.html
deleted file mode 100644
index 307420af9fc..00000000000
--- a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-18.tentative.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Forced colors mode - fill and stroke.
-  Only text and foreignObject svg elements should have fill and stroke
-  overridden in forced colors mode.
-</title>
-<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
-<link rel=match href="forced-colors-mode-18.tentative-ref.html">
-<body>
-  <!-- Discussions on SVG styles in forced colors mode are ongoing:
-       https://github.com/w3c/csswg-drafts/issues/3855 -->
-  <svg height="600" width="600">
-    <text x="0" y="15" fill="red" stroke="blue">
-      This text should have a WindowText fill and transparent stroke color in
-      forced colors mode.
-    </text>
-    <rect x="0" height="60" y="30" width="180" style="fill: red; stroke: blue;"/>
-    <foreignObject x="20" y="100" width="160" height="160">
-      <div xmlns="http://www.w3.org/1999/xhtml" style="color: blue;">
-        This text should be WindowText color in forced colors mode.
-      </div>
-      <svg height="20" width="20">
-        <rect x="0" height="20" y="0" width="20" style="fill: green; stroke: purple;"/>
-      </svg>
-    </foreignObject>
-  </svg>
-</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-26-ref.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-26-ref.html
new file mode 100644
index 00000000000..39caee40b52
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-26-ref.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - fill/stroke.
+</title>
+<style>
+  body {
+    forced-color-adjust: none;
+  }
+</style>
+<body>
+  The triangle below should be currentColor when forced colors mode.
+  <svg height="600" width="600">
+    <path fill="currentColor" d="M150 0 L75 200 L225 200 Z" />
+  </svg>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-26.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-26.html
new file mode 100644
index 00000000000..a9aa5901321
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-26.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - fill/stroke.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<link rel=match href="forced-colors-mode-26-ref.html">
+<style>
+  div {
+    fill: red;
+    stroke: blue;
+  }
+</style>
+<body>
+  <div>
+    The triangle below should be currentColor when forced colors mode.
+    <svg height="600" width="600">
+      <path d="M150 0 L75 200 L225 200 Z" />
+    </svg>
+  </div>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-26.tentative-ref.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-26.tentative-ref.html
deleted file mode 100644
index f551a434290..00000000000
--- a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-26.tentative-ref.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Forced colors mode - fill/stroke inheritance.
-  Tests that fill and stroke colors are properly inherited from parent elements.
-</title>
-<style>
-  body {
-    forced-color-adjust: none;
-  }
-</style>
-<body>
-  The triangle below should be red when forced colors mode is enabled and disabled.
-  <svg height="600" width="600">
-    <path fill="red" stroke="blue" d="M150 0 L75 200 L225 200 Z" />
-  </svg>
-</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-26.tentative.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-26.tentative.html
deleted file mode 100644
index ac21cae2380..00000000000
--- a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-26.tentative.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Forced colors mode - fill/stroke inheritance.
-  Tests that fill and stroke colors are properly inherited from parent elements.
-</title>
-<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
-<link rel=match href="forced-colors-mode-26.tentative-ref.html">
-<style>
-  div {
-    fill: red;
-    stroke: blue;
-  }
-</style>
-<body>
-  <div>
-    The triangle below should be red when forced colors mode is enabled and disabled.
-    <!-- Discussions on SVG styles in forced colors mode are ongoing:
-       https://github.com/w3c/csswg-drafts/issues/3855 -->
-    <svg height="600" width="600">
-      <path d="M150 0 L75 200 L225 200 Z" />
-    </svg>
-  </div>
-</body>
diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/anchor-fragment-form-submit-longfragment.html b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/anchor-fragment-form-submit-longfragment.html
new file mode 100644
index 00000000000..8c4c77014fc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/anchor-fragment-form-submit-longfragment.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="author" title="Joey Arhar" href="mailto:jarhar@chromium.org">
+<link rel="help" href="https://html.spec.whatwg.org/C/#following-hyperlinks">
+<title>Anchor element with onclick form submission and href to fragment</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<!-- When an anchor element has an onclick handler which submits a form,
+  the anchor's navigation should occur instead of the form's navigation.
+  However, if the anchor has an href which is just a fragment like "#",
+  then the form should be submitted. Many sites rely on this behavior. -->
+
+<iframe name="test"></iframe>
+<form target="test" action="form.html"></form>
+<a id="anchor" target="test" onclick="document.forms[0].submit()" href="#fragment">Test</a>
+
+<script>
+async_test(t => {
+  const anchor = document.getElementById('anchor');
+  t.step(() => anchor.click());
+  window.onmessage = t.step_func(event => {
+    if (typeof event.data === 'string' && event.data.includes('navigation')) {
+      assert_equals(event.data, 'form navigation');
+      t.done();
+    }
+  });
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/anchor-fragment-form-submit-withpath.html b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/anchor-fragment-form-submit-withpath.html
new file mode 100644
index 00000000000..b891623a2f5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/anchor-fragment-form-submit-withpath.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="author" title="Joey Arhar" href="mailto:jarhar@chromium.org">
+<link rel="help" href="https://html.spec.whatwg.org/C/#following-hyperlinks">
+<title>Anchor element with onclick form submission and href to fragment</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<!-- When an anchor element has an onclick handler which submits a form,
+  the anchor's navigation should occur instead of the form's navigation.
+  However, if the anchor has an href which is just a fragment like "#",
+  then the form should be submitted. Many sites rely on this behavior. -->
+
+<iframe name="test"></iframe>
+<form target="test" action="form.html"></form>
+<a id="anchor" target="test" onclick="document.forms[0].submit()">Test</a>
+
+<script>
+async_test(async t => {
+  const iframe = document.querySelector('iframe');
+  const iframeLoadPromise = new Promise(resolve => iframe.onload = resolve);
+  iframe.src = '/';
+  await iframeLoadPromise;
+
+  const anchor = document.getElementById('anchor');
+  anchor.href = '/#';
+  t.step(() => anchor.click());
+  window.onmessage = t.step_func(event => {
+    if (typeof event.data === 'string' && event.data.includes('navigation')) {
+      assert_equals(event.data, 'form navigation');
+      t.done();
+    }
+  });
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/anchor-fragment-form-submit.html b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/anchor-fragment-form-submit.html
new file mode 100644
index 00000000000..57e44f18085
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/anchor-fragment-form-submit.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="author" title="Joey Arhar" href="mailto:jarhar@chromium.org">
+<link rel="help" href="https://html.spec.whatwg.org/C/#following-hyperlinks">
+<title>Anchor element with onclick form submission and href to fragment</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<!-- When an anchor element has an onclick handler which submits a form,
+  the anchor's navigation should occur instead of the form's navigation.
+  However, if the anchor has an href which is just a fragment like "#",
+  then the form should be submitted. Many sites rely on this behavior. -->
+
+<iframe name="test"></iframe>
+<form target="test" action="form.html"></form>
+<a id="anchor" target="test" onclick="document.forms[0].submit()" href="#">Test</a>
+
+<script>
+async_test(t => {
+  const anchor = document.getElementById('anchor');
+  t.step(() => anchor.click());
+  window.onmessage = t.step_func(event => {
+    if (typeof event.data === 'string' && event.data.includes('navigation')) {
+      assert_equals(event.data, 'form navigation');
+      t.done();
+    }
+  });
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/form.html b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/form.html
new file mode 100644
index 00000000000..6523a82b393
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/form.html
@@ -0,0 +1,5 @@
+<!DOCTYPE html>
+<script>
+parent.postMessage("form navigation", "*");
+</script>
+form navigation
diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/001.html b/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/001.html
index da93e0dafc7..b4a5fd4bf4d 100644
--- a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/001.html
+++ b/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/001.html
@@ -94,7 +94,7 @@ function reportload() {
             assert_throws_dom('SECURITY_ERR',function () { history.pushState('','','data:text/html,'); });
         }, 'pushState must not be allowed to create cross-origin URLs (data:URI)');
         test(function () {
-            assert_throws_dom('SECURITY_ERR',function () { iframe.contentWindow.history.pushState('','','http://www.example.com/'); },iframe.contentWindow);
+            assert_throws_dom('SECURITY_ERR', iframe.contentWindow.DOMException, function () { iframe.contentWindow.history.pushState('','','http://www.example.com/'); });
         }, 'security errors are expected to be thrown in the context of the document that owns the history object');
         test(function () {
             iframe.contentWindow.location.hash = 'test2';
@@ -180,9 +180,9 @@ function reportload() {
             }
         }, 'pushState must be able to use an error object as data');
         test(function () {
-            assert_throws_dom( 'DATA_CLONE_ERR', function () {
+            assert_throws_dom('DATA_CLONE_ERR', iframe.contentWindow.DOMException, function () {
                 iframe.contentWindow.history.pushState(document,'');
-            }, iframe.contentWindow );
+            });
         }, 'security errors are expected to be thrown in the context of the document that owns the history object (2)');
         cloneobj = {
             nulldata: null,
diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/002.html b/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/002.html
index dba28b0471c..dcda248282f 100644
--- a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/002.html
+++ b/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/002.html
@@ -99,7 +99,7 @@ function reportload() {
             assert_throws_dom('SECURITY_ERR',function () { history.replaceState('','','data:text/html,'); });
         }, 'replaceState must not be allowed to create cross-origin URLs (data:URI)');
         test(function () {
-            assert_throws_dom('SECURITY_ERR',function () { iframe.contentWindow.history.replaceState('','','http://www.example.com/'); },iframe.contentWindow);
+            assert_throws_dom('SECURITY_ERR',iframe.contentWindow.DOMException,function () { iframe.contentWindow.history.replaceState('','','http://www.example.com/'); });
         }, 'security errors are expected to be thrown in the context of the document that owns the history object');
         test(function () {
             //avoids browsers running .go synchronously when only a hash change is involved
@@ -161,9 +161,9 @@ function reportload() {
             }
         }, 'replaceState must be able to use an error object as data');
         test(function () {
-            assert_throws_dom( 'DATA_CLONE_ERR', function () {
+            assert_throws_dom('DATA_CLONE_ERR', iframe.contentWindow.DOMException, function () {
                 iframe.contentWindow.history.replaceState(document,'');
-            }, iframe.contentWindow );
+            });
         }, 'security errors are expected to be thrown in the context of the document that owns the history object (2)');
         cloneobj = {
             nulldata: null,
diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_setter.html b/tests/wpt/web-platform-tests/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_setter.html
index 77f438c0166..25395283411 100644
--- a/tests/wpt/web-platform-tests/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_setter.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_setter.html
@@ -61,7 +61,8 @@
           assert_equals(iframe.contentWindow.location.toString(), iframe_url.toString());
           // document.open checks for same-origin, not same-origin-domain,
           // https://github.com/whatwg/html/issues/2282
-          assert_throws_dom("SecurityError", function() { iframe.contentDocument.open(); });
+          assert_throws_dom("SecurityError", iframe.contentWindow.DOMException,
+                            function() { iframe.contentDocument.open(); });
         }));
       }, "same-origin-domain iframe");
 
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/none.https.html b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/none.https.html
index 7f296e60441..e603753084c 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/none.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/none.https.html
@@ -4,8 +4,12 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=/common/utils.js></script> <!-- Use token() to allow running tests in parallel -->
+<script src="/common/get-host-info.sub.js"></script>
 <div id=log></div>
 <script>
+const HOST = get_host_info();
+const BASE = new URL("resources", location).pathname;
+
 async_test(t => {
   const frame = document.createElement("iframe");
   t.add_cleanup(() => frame.remove());
@@ -79,4 +83,19 @@ async_test(t => {
   const win = window.open(`resources/navigate-require-corp.sub.html?channelName=${bc.name}&to=navigate-none.sub.html?channelName=${bc2.name}`, "_blank", "noopener");
   assert_equals(win, null);
 }, `"require-corp" top-level noopener popup: navigating to "none" should succeed`);
+
+async_test(t => {
+  const frame = document.createElement("iframe");
+  const id = token();
+  t.add_cleanup(() => frame.remove());
+  window.addEventListener('message', t.step_func((e) => {
+    if (e.data === id) {
+      // Loaded!
+      t.done();
+    }
+  }));
+  frame.src = `${HOST.HTTPS_NOTSAMESITE_ORIGIN}${BASE}/navigate-require-corp-same-site.sub.html?token=${id}`;
+  document.body.append(frame);
+}, 'CORP: same-site is not checked.');
+
 </script>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp.https.html b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp.https.html
index 69a81311c13..6f799b6e408 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp.https.html
@@ -7,6 +7,9 @@
 <script src="/common/utils.js"></script> <!-- Use token() to allow running tests in parallel -->
 <div id=log></div>
 <script>
+const HOST = get_host_info();
+const BASE = new URL("resources", location).pathname;
+
 async_test(t => {
   const frame = document.createElement("iframe");
   t.add_cleanup(() => frame.remove());
@@ -153,4 +156,80 @@ async_test(t => {
   document.body.append(frame);
   assert_equals(frame.contentDocument.body.localName, "body");
 }, `"require-corp" top-level: navigating an iframe to a page without CORP, through a WindowProxy, should fail`);
+
+async_test(t => {
+  const frame = document.createElement("iframe");
+  const id = token();
+  t.add_cleanup(() => frame.remove());
+  window.addEventListener('message', t.step_func((e) => {
+    if (e.data === id) {
+      // Loaded!
+      t.done();
+    }
+  }));
+  // REMOTE_ORIGIN is cross-origin, same-site.
+  frame.src = `${HOST.HTTPS_REMOTE_ORIGIN}${BASE}/navigate-require-corp-same-site.sub.html?token=${id}`;
+  document.body.append(frame);
+}, 'CORP: same-site is checked and allowed.');
+
+async_test(t => {
+  const frame = document.createElement("iframe");
+  const id = token();
+  t.add_cleanup(() => frame.remove());
+  let loaded = false;
+  window.addEventListener('message', t.step_func((e) => {
+    if (e.data === id) {
+        loaded = true;
+    }
+  }));
+  t.step_timeout(() => {
+    // Make sure the iframe didn't load. See https://github.com/whatwg/html/issues/125 for why a
+    // timeout is used here. Long term all network error handling should be similar and have a
+    // reliable event.
+    assert_false(loaded);
+    t.done();
+  }, 2000);
+
+  // NOTESAMESITE_ORIGIN is cross-origin, cross-site.
+  frame.src = `${HOST.HTTPS_NOTSAMESITE_ORIGIN}${BASE}/navigate-require-corp-same-site.sub.html?token=${id}`;
+  document.body.append(frame);
+}, 'CORP: same-site is checked and blocked.');
+
+async_test(t => {
+  const frame = document.createElement("iframe");
+  const bc = new BroadcastChannel(token());
+  t.add_cleanup(() => frame.remove());
+  bc.onmessage = t.step_func_done((event) => {
+    const payload = event.data;
+    assert_equals(payload, "loaded");
+  });
+
+  const dest = `${HOST.ORIGIN}${BASE}/navigate-require-corp.sub.html?channelName=${bc.name}`;
+  // REMOTE_ORIGIN is cross-origin, same-site.
+  frame.src = `${HOST.REMOTE_ORIGIN}${BASE}/navigate-require-corp-same-site.sub.html?to=${encodeURIComponent(dest)}`;
+  document.body.append(frame);
+}, 'navigation CORP is checked with the parent frame, not the navigation source - to be allowed');
+
+async_test(t => {
+  const frame = document.createElement("iframe");
+  const bc = new BroadcastChannel(token());
+  t.add_cleanup(() => frame.remove());
+  let loaded = false;
+  bc.onmessage = t.step_func((event) => {
+    loaded = true;
+  });
+  t.step_timeout(() => {
+    // Make sure the iframe didn't load. See https://github.com/whatwg/html/issues/125 for why a
+    // timeout is used here. Long term all network error handling should be similar and have a
+    // reliable event.
+    assert_false(loaded);
+    t.done();
+  }, 2000);
+
+  const dest = `${HOST.REMOTE_ORIGIN}${BASE}/navigate-require-corp.sub.html?channelName=${bc.name}`;
+  // REMOTE_ORIGIN is cross-origin, same-site.
+  frame.src = `${HOST.REMOTE_ORIGIN}${BASE}/navigate-require-corp-same-site.sub.html?to=${encodeURIComponent(dest)}`;
+  document.body.append(frame);
+}, 'navigation CORP is checked with the parent frame, not the navigation source - to be blocked');
+
 </script>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/navigate-require-corp-same-site.sub.html b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/navigate-require-corp-same-site.sub.html
new file mode 100644
index 00000000000..9a0ebe544a0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/navigate-require-corp-same-site.sub.html
@@ -0,0 +1,29 @@
+<!doctype html>
+<script>
+  const current = new URL(window.location.href);
+  const token = current.searchParams.get("token");
+  const navigateTo = current.searchParams.get("to");
+  const channelName = current.searchParams.get("channelName");
+  const clearOpener = current.searchParams.get("clearOpener");
+
+  if (clearOpener) {
+    window.opener = null;
+  }
+
+  current.search = "";
+  if (navigateTo) {
+    let next = new URL(navigateTo, current);
+    setTimeout(() => {
+      window.location = next.href;
+    }, 50);
+  }
+
+  if (channelName) {
+    let bc = new BroadcastChannel(channelName);
+    bc.postMessage("loaded");
+  }
+
+  if (parent !== window && token) {
+    parent.postMessage(token, "*");
+  }
+</script>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/navigate-require-corp-same-site.sub.html.headers b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/navigate-require-corp-same-site.sub.html.headers
new file mode 100644
index 00000000000..56d0ac34282
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/navigate-require-corp-same-site.sub.html.headers
@@ -0,0 +1,2 @@
+Cross-Origin-Embedder-Policy: require-corp
+Cross-Origin-Resource-Policy: same-site
diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/blob-data.https.html b/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/blob-data.https.html
new file mode 100644
index 00000000000..b35d8c2798a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/blob-data.https.html
@@ -0,0 +1,131 @@
+<!doctype html>
+<meta charset=utf-8>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id=log></div>
+<script>
+const url = new URL("./", self.location);
+
+function httpWorkerIncrementerTest(name) {
+  return `
+promise_test(t => {
+  const worker = new Worker("${url.href}resources/incrementer-worker.js");
+
+  return testSharingViaIncrementerScript(t, worker, "parent worker", worker, "sub-worker");
+}, "${name}: postMessaging to a dedicated HTTP sub-worker allows them to see each others' modifications");
+`;
+}
+
+function dataWorkerIncrementerTest(name, origin = "null") {
+  return `
+promise_test(t => {
+  const worker = new Worker(URL.createObjectURL(new Blob([\`
+const view = new Uint8Array(new SharedArrayBuffer(1));
+self.onmessage = () => {
+  const succeeded = (view[0] === 1);
+  self.postMessage({ succeeded });
+};
+self.postMessage({ origin: self.origin, view });
+\`], { type: "text/javascript" })));
+
+  return new Promise((resolve, reject) => {
+    // Initially the sub-worker gives us an object containing an origin and a view on a shared
+    // buffer. We then modify the shared buffer through the buffer and tell the sub-worker to
+    // "continue". The sub-worker verifies the modification and relays whether it succeeded.
+    worker.onmessage = t.step_func(({ data }) => {
+      if ("succeeded" in data) {
+        assert_true(data.succeeded);
+        resolve();
+      } else {
+        assert_equals(data.origin, "${origin}");
+        assert_equals(data.view[0], 0);
+        data.view[0] = 1;
+        worker.postMessage("continue");
+      }
+    });
+    worker.onmessageerror = reject;
+  });
+}, "${name}: postMessaging to a dedicated blob sub-worker allows them to see each others' modifications");
+`;
+}
+
+function propertyTests(name) {
+  return `
+test(() => {
+  assert_equals(self.origin, self.location.origin);
+}, "${name}: self.origin");
+
+test(() => {
+  assert_true(self.crossOriginIsolated);
+}, "${name}: self.crossOriginIsolated");
+
+test(() => {
+  assert_true(self.isSecureContext);
+}, "${name}: self.isSecureContext");
+`;
+}
+
+const workerScript = `
+importScripts("${url.origin}/resources/testharness.js");
+importScripts("${url.href}resources/test-incrementer.js");
+
+${httpWorkerIncrementerTest("blob worker")}
+
+${dataWorkerIncrementerTest("blob worker", self.location.origin)}
+
+${propertyTests("blob worker")}
+
+done();
+`;
+
+fetch_tests_from_worker(new Worker(URL.createObjectURL(new Blob([workerScript], { type: "text/javascript" }))));
+
+const frameScript = `
+<!doctype html>
+<script src=${url.origin}/resources/testharness.js><\/script>
+<script src=${url.href}resources/test-incrementer.js><\/script>
+<script>
+${httpWorkerIncrementerTest("blob frame")}
+
+${dataWorkerIncrementerTest("blob frame", self.location.origin)}
+
+${propertyTests("blob frame")}
+<\/script>
+`;
+
+const frame = document.body.appendChild(document.createElement("iframe"));
+frame.src = URL.createObjectURL(new Blob([frameScript], { type: "text/html" }));
+frame.style = "display:none";
+fetch_tests_from_window(frame.contentWindow);
+
+const dataWorkerScript = `
+importScripts("${url.origin}/resources/testharness.js");
+
+// Cannot use httpWorkerIncrementerTest() here as the HTTP URL is not same origin.
+
+${dataWorkerIncrementerTest("data worker")}
+
+${propertyTests("data worker")}
+
+done();
+`;
+
+fetch_tests_from_worker(new Worker(`data:,${dataWorkerScript}`));
+
+const dataFrameScript = `
+<!doctype html>
+<script src=${url.origin}/resources/testharness.js><\/script>
+<script>
+// Cannot use httpWorkerIncrementerTest() here as the HTTP URL is not same origin.
+
+${dataWorkerIncrementerTest("data frame")}
+
+${propertyTests("data frame")}
+<\/script>
+`;
+
+const dataFrame = document.body.appendChild(document.createElement("iframe"));
+dataFrame.src = `data:text/html,${dataFrameScript}`;
+dataFrame.style = "display:none";
+fetch_tests_from_window(dataFrame.contentWindow);
+</script>
diff --git a/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/blob-data.https.html.headers b/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/blob-data.https.html.headers
new file mode 100644
index 00000000000..63b60e490f4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/blob-data.https.html.headers
@@ -0,0 +1,2 @@
+Cross-Origin-Opener-Policy: same-origin
+Cross-Origin-Embedder-Policy: require-corp
diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-empty-alt-replaced.html b/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-empty-alt-replaced.html
new file mode 100644
index 00000000000..3cc06d6c853
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-empty-alt-replaced.html
@@ -0,0 +1,23 @@
+<!doctype html>
+<title>Images with an empty alt attribute have an intrinsic size of zero</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  img {
+    width: 50px;
+    height: auto;
+  }
+</style>
+<img src="broken">
+<img src="broken" alt="non-empty">
+<img src="broken" alt="">
+<script>
+const t = async_test("Images with an empty alt attribute have an intrinsic size of zero");
+onload = t.step_func_done(function() {
+  for (const img of document.querySelectorAll("img")) {
+    const alt = img.getAttribute("alt");
+    const shouldTakeUpSpace = alt == null || alt.length > 0;
+    (shouldTakeUpSpace ? assert_not_equals : assert_equals)(img.offsetHeight, 0, img.outerHTML);
+  }
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/maxlength-number.html b/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/maxlength-number.html
new file mode 100644
index 00000000000..1e1d9f694cf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/maxlength-number.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<title>input type=number maxlength</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<input type="number" maxlength="1">
+
+<script>
+  async_test(t => {
+    let elem = document.getElementsByTagName("input")[0];
+    test_driver.send_keys(elem, "1234")
+      .then(t.step_func(() => {
+         assert_equals(elem.value, "1234");
+         t.done();
+      }));
+  }, "maxlength doesn't apply to input type=number");
+</script>
diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-exception-vs-return-origin.sub.window.js b/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-exception-vs-return-origin.sub.window.js
index d60be3b8d60..b20c3e3f317 100644
--- a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-exception-vs-return-origin.sub.window.js
+++ b/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-exception-vs-return-origin.sub.window.js
@@ -14,9 +14,14 @@ async_test(t => {
   iframe.onload = t.step_func_done(() => {
     // Since this is called as an event handler on an element of this window,
     // the entry settings object is that of this browsing context.
-    assert_throws_dom("InvalidStateError", () => {
-      iframe.contentDocument.open();
-    }, "opening an XML document should throw an InvalidStateError");
+    assert_throws_dom(
+      "InvalidStateError",
+      iframe.contentWindow.DOMException,
+      () => {
+        iframe.contentDocument.open();
+      },
+      "opening an XML document should throw an InvalidStateError"
+    );
   });
   const frameURL = new URL("resources/bailout-order-xml-with-domain-frame.sub.xhtml", document.URL);
   frameURL.port = "{{ports[http][1]}}";
@@ -39,9 +44,14 @@ async_test(t => {
     // IDL algorithm in "create an element", called by "create an element for a
     // token" in the parser.
     setEntryToTopLevel(t.step_func_done(() => {
-      assert_throws_dom("InvalidStateError", () => {
-        iframe.contentDocument.open();
-      }, "opening a document when the throw-on-dynamic-markup-insertion counter is incremented should throw an InvalidStateError");
+      assert_throws_dom(
+        "InvalidStateError",
+        iframe.contentWindow.DOMException,
+        () => {
+          iframe.contentDocument.open();
+        },
+        "opening a document when the throw-on-dynamic-markup-insertion counter is incremented should throw an InvalidStateError"
+      );
     }));
   });
   const frameURL = new URL("resources/bailout-order-custom-element-with-domain-frame.sub.html", document.URL);
@@ -60,9 +70,14 @@ async_test(t => {
     // "Clean up after running script" is executed when the </script> tag is
     // seen by the HTML parser.
     setEntryToTopLevel(t.step_func_done(() => {
-      assert_throws_dom("SecurityError", () => {
-        iframe.contentDocument.open();
-      }, "opening a same origin-domain (but not same origin) document should throw a SecurityError");
+      assert_throws_dom(
+        "SecurityError",
+        iframe.contentWindow.DOMException,
+        () => {
+          iframe.contentDocument.open();
+        },
+        "opening a same origin-domain (but not same origin) document should throw a SecurityError"
+      );
     }));
   });
   const frameURL = new URL("resources/bailout-order-synchronous-script-with-domain-frame.sub.html", document.URL);
@@ -85,9 +100,14 @@ for (const ev of ["beforeunload", "pagehide", "unload"]) {
         // "Clean up after running script" is called in the task that
         // navigates.
         setEntryToTopLevel(t.step_func_done(() => {
-          assert_throws_dom("SecurityError", () => {
-            iframe.contentDocument.open();
-          }, "opening a same origin-domain (but not same origin) document should throw a SecurityError");
+          assert_throws_dom(
+            "SecurityError",
+            iframe.contentWindow.DOMException,
+            () => {
+              iframe.contentDocument.open();
+            },
+            "opening a same origin-domain (but not same origin) document should throw a SecurityError"
+          );
         }));
       }));
       iframe.src = "about:blank";
diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-exception-vs-return-xml.window.js b/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-exception-vs-return-xml.window.js
index 8b1a04fe83a..45a67f925bc 100644
--- a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-exception-vs-return-xml.window.js
+++ b/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-exception-vs-return-xml.window.js
@@ -2,7 +2,7 @@ async_test(t => {
   const iframe = document.body.appendChild(document.createElement("iframe"));
   t.add_cleanup(() => { iframe.remove(); });
   self.testSynchronousScript = t.step_func_done(() => {
-    assert_throws_dom("InvalidStateError", () => {
+    assert_throws_dom("InvalidStateError", iframe.contentWindow.DOMException, () => {
       iframe.contentDocument.open();
     }, "opening an XML document should throw");
   });
@@ -15,7 +15,7 @@ for (const ev of ["beforeunload", "pagehide", "unload"]) {
     t.add_cleanup(() => { iframe.remove(); });
     iframe.addEventListener("load", t.step_func(() => {
       iframe.contentWindow.addEventListener(ev, t.step_func_done(() => {
-        assert_throws_dom("InvalidStateError", () => {
+        assert_throws_dom("InvalidStateError", iframe.contentWindow.DOMException, () => {
           iframe.contentDocument.open();
         }, "opening an XML document should throw");
       }));
diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-side-effects-same-origin-domain.sub.window.js b/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-side-effects-same-origin-domain.sub.window.js
index 9adacb2a99f..f5edd7aed9c 100644
--- a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-side-effects-same-origin-domain.sub.window.js
+++ b/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-side-effects-same-origin-domain.sub.window.js
@@ -7,7 +7,7 @@ testInIFrame("http://{{host}}:{{ports[http][1]}}/common/domain-setter.sub.html",
   const iframe = ctx.iframes[0];
   const origURL = iframe.contentDocument.URL;
   assertDocumentIsReadyForSideEffectsTest(iframe.contentDocument, "same origin-domain (but not same origin) document");
-  assert_throws_dom("SecurityError", () => {
+  assert_throws_dom("SecurityError", iframe.contentWindow.DOMException, () => {
     ctx.iframes[0].contentDocument.open();
   }, "document.open() should throw a SecurityError on a same origin-domain (but not same origin) document");
   assertOpenHasNoSideEffects(iframe.contentDocument, origURL, "same origin-domain (but not same origin) document");
diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-side-effects-xml.window.js b/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-side-effects-xml.window.js
index bcc4266319a..bbfc015c68e 100644
--- a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-side-effects-xml.window.js
+++ b/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-side-effects-xml.window.js
@@ -7,9 +7,14 @@ async_test(t => {
   iframe.onload = t.step_func_done(() => {
     const origURL = iframe.contentDocument.URL;
     assertDocumentIsReadyForSideEffectsTest(iframe.contentDocument, "XML document");
-    assert_throws_dom("InvalidStateError", () => {
-      iframe.contentDocument.open();
-    }, "document.open() should throw on XML documents");
+    assert_throws_dom(
+      "InvalidStateError",
+      iframe.contentWindow.DOMException,
+      () => {
+        iframe.contentDocument.open();
+      },
+      "document.open() should throw on XML documents"
+    );
     assertOpenHasNoSideEffects(iframe.contentDocument, origURL, "XML document");
   });
 }, "document.open bailout should not have any side effects (XML document)");
diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/origin-check-in-document-open-same-origin-domain.sub.html b/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/origin-check-in-document-open-same-origin-domain.sub.html
index 83ce50d6c4d..ba4ef3bae88 100644
--- a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/origin-check-in-document-open-same-origin-domain.sub.html
+++ b/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/origin-check-in-document-open-same-origin-domain.sub.html
@@ -9,14 +9,16 @@
 <script>
 testInIFrame("http://{{host}}:{{ports[http][1]}}/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/set-document-domain.html", (ctx) => {
   document.domain = document.domain;
-  var doc = ctx.iframes[0].contentDocument;
-  assert_throws_dom("SecurityError", doc.open.bind(doc), "Opening a same origin-domain (but not same origin) document doesn't throw.");
+  let doc = ctx.iframes[0].contentDocument;
+  let constructor = ctx.iframes[0].contentWindow.DOMException;
+  assert_throws_dom("SecurityError", constructor, doc.open.bind(doc), "Opening a same origin-domain (but not same origin) document doesn't throw.");
 }, "It should not be possible to open same origin-domain (but not same origin) documents.");
 
 testInIFrame("http://{{host}}:{{ports[http][1]}}/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/resources/set-document-domain.html", (ctx) => {
   document.domain = document.domain;
-  var doc = ctx.iframes[0].contentDocument;
-  assert_throws_dom("SecurityError", doc.write.bind(doc, ""), "Implicitly opening a same origin-domain (but not same origin) document doesn't throw.");
+  let doc = ctx.iframes[0].contentDocument;
+  let constructor = ctx.iframes[0].contentWindow.DOMException;
+  assert_throws_dom("SecurityError", constructor, doc.write.bind(doc, ""), "Implicitly opening a same origin-domain (but not same origin) document doesn't throw.");
 }, "It should not be possible to implicitly open same origin-domain (but not same origin) documents.");
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/imagebitmap-renderingcontext/context-creation-offscreen.html b/tests/wpt/web-platform-tests/imagebitmap-renderingcontext/context-creation-offscreen.html
index 05a920cd3e6..66d4cce420a 100644
--- a/tests/wpt/web-platform-tests/imagebitmap-renderingcontext/context-creation-offscreen.html
+++ b/tests/wpt/web-platform-tests/imagebitmap-renderingcontext/context-creation-offscreen.html
@@ -12,7 +12,7 @@ test(function() {
     var ctx = canvas.getContext('bitmaprenderer');
     assert_true(ctx instanceof ImageBitmapRenderingContext);
     assert_true("canvas" in ctx);
-    assert_object_equals(canvas, ctx.canvas);
+    assert_equals(canvas, ctx.canvas);
 }, "Test that canvas.getContext('bitmaprenderer') returns an instance of ImageBitmapRenderingContext and ctx.canvas on a ImageBitmapRenderingContext returns the original OffscreenCanvas");
 
 </script>
diff --git a/tests/wpt/web-platform-tests/interfaces/css-font-loading.idl b/tests/wpt/web-platform-tests/interfaces/css-font-loading.idl
index 2bbc35a2591..936ded788bc 100644
--- a/tests/wpt/web-platform-tests/interfaces/css-font-loading.idl
+++ b/tests/wpt/web-platform-tests/interfaces/css-font-loading.idl
@@ -18,10 +18,10 @@ dictionary FontFaceDescriptors {
 
 enum FontFaceLoadStatus { "unloaded", "loading", "loaded", "error" };
 
-[Constructor(CSSOMString family, (CSSOMString or BinaryData) source,
-             optional FontFaceDescriptors descriptors),
- Exposed=(Window,Worker)]
+[Exposed=(Window,Worker)]
 interface FontFace {
+  constructor(CSSOMString family, (CSSOMString or BinaryData) source,
+                optional FontFaceDescriptors descriptors = {});
   attribute CSSOMString family;
   attribute CSSOMString style;
   attribute CSSOMString weight;
@@ -42,9 +42,9 @@ dictionary FontFaceSetLoadEventInit : EventInit {
   sequence<FontFace> fontfaces = [];
 };
 
-[Constructor(CSSOMString type, optional FontFaceSetLoadEventInit eventInitDict),
- Exposed=(Window,Worker)]
+[Exposed=(Window,Worker)]
 interface FontFaceSetLoadEvent : Event {
+  constructor(CSSOMString type, optional FontFaceSetLoadEventInit eventInitDict = {});
   [SameObject] readonly attribute FrozenArray<FontFace> fontfaces;
 };
 
@@ -52,9 +52,10 @@ enum FontFaceSetLoadStatus { "loading", "loaded" };
 
 callback ForEachCallback = void (FontFace font, long index, FontFaceSet self);
 
-[Exposed=(Window,Worker),
- Constructor(sequence<FontFace> initialFaces)]
+[Exposed=(Window,Worker)]
 interface FontFaceSet : EventTarget {
+  constructor(sequence<FontFace> initialFaces);
+
   // FontFaceSet is Set-like!
   setlike<FontFace>;
   FontFaceSet add(FontFace font);
diff --git a/tests/wpt/web-platform-tests/interfaces/cssom-view.idl b/tests/wpt/web-platform-tests/interfaces/cssom-view.idl
index 2745ba96dc0..82517fefcc2 100644
--- a/tests/wpt/web-platform-tests/interfaces/cssom-view.idl
+++ b/tests/wpt/web-platform-tests/interfaces/cssom-view.idl
@@ -58,9 +58,9 @@ interface MediaQueryList : EventTarget {
            attribute EventHandler onchange;
 };
 
-[Exposed=Window,
- Constructor(CSSOMString type, optional MediaQueryListEventInit eventInitDict = {})]
+[Exposed=Window]
 interface MediaQueryListEvent : Event {
+  constructor(CSSOMString type, optional MediaQueryListEventInit eventInitDict = {});
   readonly attribute CSSOMString media;
   readonly attribute boolean matches;
 };
diff --git a/tests/wpt/web-platform-tests/interfaces/resize-observer.idl b/tests/wpt/web-platform-tests/interfaces/resize-observer.idl
index d53e9da55ee..448c949df9e 100644
--- a/tests/wpt/web-platform-tests/interfaces/resize-observer.idl
+++ b/tests/wpt/web-platform-tests/interfaces/resize-observer.idl
@@ -11,9 +11,9 @@ dictionary ResizeObserverOptions {
     ResizeObserverBoxOptions box = "content-box";
 };
 
-[Exposed=(Window),
- Constructor(ResizeObserverCallback callback)]
+[Exposed=(Window)]
 interface ResizeObserver {
+    constructor(ResizeObserverCallback callback);
     void observe(Element target, optional ResizeObserverOptions options);
     void unobserve(Element target);
     void disconnect();
@@ -35,9 +35,8 @@ interface ResizeObserverSize {
     readonly attribute unrestricted double blockSize;
 };
 
-[Constructor(Element target)
-]
 interface ResizeObservation {
+    constructor(Element target);
     readonly attribute Element target;
     readonly attribute ResizeObserverBoxOptions observedBox;
     readonly attribute sequence<ResizeObserverSize> lastReportedSizes;
diff --git a/tests/wpt/web-platform-tests/interfaces/scroll-animations.idl b/tests/wpt/web-platform-tests/interfaces/scroll-animations.idl
index 865419c15b5..a247308e50e 100644
--- a/tests/wpt/web-platform-tests/interfaces/scroll-animations.idl
+++ b/tests/wpt/web-platform-tests/interfaces/scroll-animations.idl
@@ -20,9 +20,9 @@ dictionary ScrollTimelineOptions {
   (double or ScrollTimelineAutoKeyword) timeRange = "auto";
 };
 
-[Exposed=Window,
- Constructor(optional ScrollTimelineOptions options = {})]
+[Exposed=Window]
 interface ScrollTimeline : AnimationTimeline {
+  constructor(optional ScrollTimelineOptions options = {});
   readonly attribute Element scrollSource;
   readonly attribute ScrollDirection orientation;
   readonly attribute DOMString startScrollOffset;
diff --git a/tests/wpt/web-platform-tests/interfaces/visual-viewport.idl b/tests/wpt/web-platform-tests/interfaces/visual-viewport.idl
index 8e9316bf854..5e4b5413694 100644
--- a/tests/wpt/web-platform-tests/interfaces/visual-viewport.idl
+++ b/tests/wpt/web-platform-tests/interfaces/visual-viewport.idl
@@ -7,6 +7,7 @@ partial interface Window {
   [SameObject, Replaceable] readonly attribute VisualViewport visualViewport;
 };
 
+[Exposed=Window]
 interface VisualViewport : EventTarget {
   readonly attribute double offsetLeft;
   readonly attribute double offsetTop;
diff --git a/tests/wpt/web-platform-tests/interfaces/web-bluetooth.idl b/tests/wpt/web-platform-tests/interfaces/web-bluetooth.idl
index 65c4e20ef34..cbf09e1d7ed 100644
--- a/tests/wpt/web-platform-tests/interfaces/web-bluetooth.idl
+++ b/tests/wpt/web-platform-tests/interfaces/web-bluetooth.idl
@@ -30,6 +30,7 @@ interface Bluetooth : EventTarget {
   attribute EventHandler onavailabilitychanged;
   [SameObject]
   readonly attribute BluetoothDevice? referringDevice;
+  Promise<sequence<BluetoothDevice>> getDevices();
   Promise<BluetoothDevice> requestDevice(optional RequestDeviceOptions options = {});
 };
 
@@ -51,7 +52,7 @@ dictionary AllowedBluetoothDevice {
   // An allowedServices of "all" means all services are allowed.
   required (DOMString or sequence<UUID>) allowedServices;
 };
-dictionary BluetoothPermissionData {
+dictionary BluetoothPermissionStorage {
   required sequence<AllowedBluetoothDevice> allowedDevices;
 };
 
diff --git a/tests/wpt/web-platform-tests/interfaces/webaudio.idl b/tests/wpt/web-platform-tests/interfaces/webaudio.idl
index 9491090337c..f0a5c7a9020 100644
--- a/tests/wpt/web-platform-tests/interfaces/webaudio.idl
+++ b/tests/wpt/web-platform-tests/interfaces/webaudio.idl
@@ -129,9 +129,7 @@ interface AudioBuffer {
                         unsigned long channelNumber,
                         optional unsigned long bufferOffset = 0);
   void copyToChannel (Float32Array source,
-
                       unsigned long channelNumber,
-
                       optional unsigned long bufferOffset = 0);
 };
 
@@ -198,9 +196,7 @@ interface AudioParam {
   AudioParam exponentialRampToValueAtTime (float value, double endTime);
   AudioParam setTargetAtTime (float target, double startTime, float timeConstant);
   AudioParam setValueCurveAtTime (sequence<float> values,
-
                                   double startTime,
-
                                   double duration);
   AudioParam cancelScheduledValues (double cancelTime);
   AudioParam cancelAndHoldAtTime (double cancelTime);
diff --git a/tests/wpt/web-platform-tests/lint.whitelist b/tests/wpt/web-platform-tests/lint.whitelist
index a79d77f2fed..6ea2bd4ec1e 100644
--- a/tests/wpt/web-platform-tests/lint.whitelist
+++ b/tests/wpt/web-platform-tests/lint.whitelist
@@ -297,6 +297,7 @@ SET TIMEOUT: document-policy/font-display/font-display-document-policy-01.tentat
 SET TIMEOUT: html/browsers/windows/auxiliary-browsing-contexts/resources/close-opener.html
 SET TIMEOUT: html/cross-origin-embedder-policy/resources/navigate-none.sub.html
 SET TIMEOUT: html/cross-origin-embedder-policy/resources/navigate-require-corp.sub.html
+SET TIMEOUT: html/cross-origin-embedder-policy/resources/navigate-require-corp-same-site.sub.html
 SET TIMEOUT: html/dom/documents/dom-tree-accessors/Document.currentScript.html
 SET TIMEOUT: html/webappapis/timers/*
 SET TIMEOUT: portals/history/resources/portal-harness.js
diff --git a/tests/wpt/web-platform-tests/performance-timeline/po-disconnect-removes-observed-types.any.js b/tests/wpt/web-platform-tests/performance-timeline/po-disconnect-removes-observed-types.any.js
new file mode 100644
index 00000000000..cac97bea075
--- /dev/null
+++ b/tests/wpt/web-platform-tests/performance-timeline/po-disconnect-removes-observed-types.any.js
@@ -0,0 +1,19 @@
+// META: script=performanceobservers.js
+
+async_test(function (t) {
+  const observer  = new PerformanceObserver(
+      t.step_func(function (entryList) {
+        // There should be no mark entry.
+        checkEntries(entryList.getEntries(),
+          [{ entryType: "measure", name: "b"}]);
+        t.done();
+      })
+    );
+  observer.observe({type: "mark"});
+  // Disconnect the observer.
+  observer.disconnect();
+  // Now, only observe measure.
+  observer.observe({type: "measure"});
+  performance.mark("a");
+  performance.measure("b");
+}, "Types observed are forgotten when disconnect() is called.");
diff --git a/tests/wpt/web-platform-tests/performance-timeline/po-observe-repeated-type.any.js b/tests/wpt/web-platform-tests/performance-timeline/po-observe-repeated-type.any.js
new file mode 100644
index 00000000000..2bba396a6b6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/performance-timeline/po-observe-repeated-type.any.js
@@ -0,0 +1,17 @@
+// META: script=performanceobservers.js
+
+async_test(function (t) {
+  const observer  = new PerformanceObserver(
+      t.step_func(function (entryList) {
+        checkEntries(entryList.getEntries(),
+          [{ entryType: "mark", name: "early"}]);
+        observer.disconnect();
+        t.done();
+      })
+    );
+  performance.mark("early");
+  // This call will not trigger anything.
+  observer.observe({type: "mark"});
+  // This call should override the previous call and detect the early mark.
+  observer.observe({type: "mark", buffered: true});
+}, "Two calls of observe() with the same 'type' cause override.");
diff --git a/tests/wpt/web-platform-tests/portals/about-blank-cannot-host.html b/tests/wpt/web-platform-tests/portals/about-blank-cannot-host.html
index 59858c690dc..6a721c32e68 100644
--- a/tests/wpt/web-platform-tests/portals/about-blank-cannot-host.html
+++ b/tests/wpt/web-platform-tests/portals/about-blank-cannot-host.html
@@ -4,6 +4,7 @@
 <script>
 
 promise_test(async (t) => {
+  assert_precondition("HTMLPortalElement" in self);
   let hostWindow = window.open();
   assert_equals(hostWindow.location.href, "about:blank");
 
diff --git a/tests/wpt/web-platform-tests/portals/csp/frame-src.sub.html b/tests/wpt/web-platform-tests/portals/csp/frame-src.sub.html
index 34f1474d4b3..1b37fd4ac21 100644
--- a/tests/wpt/web-platform-tests/portals/csp/frame-src.sub.html
+++ b/tests/wpt/web-platform-tests/portals/csp/frame-src.sub.html
@@ -6,6 +6,7 @@
 </body>
 <script>
   async_test(function(t) {
+    assert_precondition("HTMLPortalElement" in self);
     var w = window.open("resources/frame-src.sub.html?frame_src_policy=%27none%27");
     w.onload = function() {
       w.document.addEventListener("securitypolicyviolation",
@@ -20,6 +21,7 @@
   }, "Tests that a portal can't be loaded when it violates frame-src");
 
   async_test(function(t) {
+    assert_precondition("HTMLPortalElement" in self);
     var w = window.open(`resources/frame-src.sub.html?frame_src_policy=http://{{hosts[][www]}}:{{ports[http][0]}}`);
     w.onload = function() {
       w.document.onsecuritypolicyviolation = t.unreached_func("Portal should load.");
@@ -30,7 +32,7 @@
     }
   }, "Tests that a portal can be loaded when the origin matches the frame-src CSP header.");
   async_test(function(t) {
-
+    assert_precondition("HTMLPortalElement" in self);
     var w = window.open(`resources/frame-src.sub.html?frame_src_policy=http://{{hosts[][www]}}:{{ports[http][0]}}`);
     w.onload = function() {
       var portal = w.document.createElement("portal");
diff --git a/tests/wpt/web-platform-tests/portals/history/history-manipulation-inside-portal.html b/tests/wpt/web-platform-tests/portals/history/history-manipulation-inside-portal.html
index d19e153e51c..efbf1de136c 100644
--- a/tests/wpt/web-platform-tests/portals/history/history-manipulation-inside-portal.html
+++ b/tests/wpt/web-platform-tests/portals/history/history-manipulation-inside-portal.html
@@ -16,36 +16,42 @@
   }
 
   promise_test(async () => {
+    assert_precondition("HTMLPortalElement" in self);
     assertInitialHistoryState();
     await runTestInPortal(portalSrc, 'testHistoryPushStateInPortal');
     assertInitialHistoryState();
   }, 'history.pushState navigates independently with replacement in a portal');
 
   promise_test(async () => {
+    assert_precondition("HTMLPortalElement" in self);
     assertInitialHistoryState();
     await runTestInPortal(portalSrc, 'testHistoryReplaceStateInPortal');
     assertInitialHistoryState();
   }, 'history.replaceState navigates independently in a portal');
 
   promise_test(async () => {
+    assert_precondition("HTMLPortalElement" in self);
     assertInitialHistoryState();
     await runTestInPortal(portalSrc, 'testLocationAssignInPortal');
     assertInitialHistoryState();
   }, 'location.assign navigates independently with replacement in a portal');
 
   promise_test(async () => {
+    assert_precondition("HTMLPortalElement" in self);
     assertInitialHistoryState();
     await runTestInPortal(portalSrc, 'testLocationReplaceInPortal');
     assertInitialHistoryState();
   }, 'location.replace navigates independently in a portal');
 
   promise_test(async () => {
+    assert_precondition("HTMLPortalElement" in self);
     assertInitialHistoryState();
     await runTestInPortal(portalSrc, 'testSetLocationHrefInPortal');
     assertInitialHistoryState();
   }, 'Setting location.href navigates independently with replacement in a portal');
 
   promise_test(async () => {
+    assert_precondition("HTMLPortalElement" in self);
     assertInitialHistoryState();
     await runTestInPortal(portalSrc, 'testSyntheticAnchorClickInPortal');
     assertInitialHistoryState();
diff --git a/tests/wpt/web-platform-tests/portals/htmlportalelement-event-handler-content-attributes.html b/tests/wpt/web-platform-tests/portals/htmlportalelement-event-handler-content-attributes.html
index 8fc26386cfc..04b4615205a 100644
--- a/tests/wpt/web-platform-tests/portals/htmlportalelement-event-handler-content-attributes.html
+++ b/tests/wpt/web-platform-tests/portals/htmlportalelement-event-handler-content-attributes.html
@@ -7,6 +7,7 @@
 let eventNames = ["load", "message", "messageerror"];
 test(() => {
   try {
+    assert_precondition("HTMLPortalElement" in self);
     let portal = document.createElement("portal");
     for (let eventName of eventNames) {
       window.testValue = "not fired";
diff --git a/tests/wpt/web-platform-tests/portals/portal-activate-data.html b/tests/wpt/web-platform-tests/portals/portal-activate-data.html
index 9a712c91495..cefb0eae3dc 100644
--- a/tests/wpt/web-platform-tests/portals/portal-activate-data.html
+++ b/tests/wpt/web-platform-tests/portals/portal-activate-data.html
@@ -13,6 +13,7 @@ function nextMessage(target) {
 }
 
 async function openPortalAndActivate(logic, activateOptions) {
+  assert_precondition("HTMLPortalElement" in self);
   const w = await openBlankPortalHost();
   try {
     const portal = w.document.createElement('portal');
diff --git a/tests/wpt/web-platform-tests/portals/portal-activate-event.html b/tests/wpt/web-platform-tests/portals/portal-activate-event.html
index 780e8b58af9..990dc2d4b85 100644
--- a/tests/wpt/web-platform-tests/portals/portal-activate-event.html
+++ b/tests/wpt/web-platform-tests/portals/portal-activate-event.html
@@ -4,6 +4,7 @@
 <script src="/resources/testharnessreport.js"></script>
 <script>
   async_test(function(t) {
+    assert_precondition("HTMLPortalElement" in self);
     let test = "eventlistener";
     var bc = new BroadcastChannel(`test-${test}`);
     bc.onmessage = t.step_func_done(function(e) {
@@ -15,6 +16,7 @@
   }, "Tests that the PortalActivateEvent is dispatched when a portal is activated.");
 
   async_test(function(t) {
+    assert_precondition("HTMLPortalElement" in self);
     let test = "eventhandler";
     var bc = new BroadcastChannel(`test-${test}`);
     bc.onmessage = t.step_func_done(function(e) {
@@ -26,6 +28,7 @@
   }, "Tests that the portalactivate event handler is dispatched when a portal is activated.");
 
   async_test(function(t) {
+    assert_precondition("HTMLPortalElement" in self);
     let test = "bodyeventhandler";
     var bc = new BroadcastChannel(`test-${test}`);
     bc.onmessage = t.step_func_done(function(e) {
diff --git a/tests/wpt/web-platform-tests/portals/portal-non-http-navigation.html b/tests/wpt/web-platform-tests/portals/portal-non-http-navigation.html
index 3b79df3c230..e2b5d3d3937 100644
--- a/tests/wpt/web-platform-tests/portals/portal-non-http-navigation.html
+++ b/tests/wpt/web-platform-tests/portals/portal-non-http-navigation.html
@@ -5,6 +5,7 @@
 <body>
 <script>
 async_test(t => {
+  assert_precondition("HTMLPortalElement" in self);
   var portal = document.createElement("portal");
   portal.src = "data:text/html,empty portal";
   portal.onload = t.unreached_func("Portal loaded data URL.");
@@ -13,6 +14,7 @@ async_test(t => {
 }, "Tests that a portal can't navigate to a data URL.");
 
 async_test(t => {
+  assert_precondition("HTMLPortalElement" in self);
   var portal = document.createElement("portal");
   portal.src = "about:blank";
   portal.onload = t.unreached_func("Portal loaded about:blank.");
@@ -21,6 +23,7 @@ async_test(t => {
 }, "Tests that a portal can't navigate to about:blank.");
 
 async_test(t => {
+  assert_precondition("HTMLPortalElement" in self);
   var portal = document.createElement("portal");
   portal.src = "resources/simple-portal.html";
   portal.onload = t.step_func(() => {
diff --git a/tests/wpt/web-platform-tests/portals/portal-onload-event.html b/tests/wpt/web-platform-tests/portals/portal-onload-event.html
index c9f07fcc889..da770013e26 100644
--- a/tests/wpt/web-platform-tests/portals/portal-onload-event.html
+++ b/tests/wpt/web-platform-tests/portals/portal-onload-event.html
@@ -4,6 +4,7 @@
 <script src="/resources/testharnessreport.js"></script>
 <script>
   async_test(function(t) {
+    assert_precondition("HTMLPortalElement" in self);
     var w = window.open("resources/simple-portal.html");
     w.onload = function() {
       var portal = w.document.createElement("portal");
diff --git a/tests/wpt/web-platform-tests/portals/portals-activate-empty-browsing-context.html b/tests/wpt/web-platform-tests/portals/portals-activate-empty-browsing-context.html
index 4beff610ea0..d904cd58543 100644
--- a/tests/wpt/web-platform-tests/portals/portals-activate-empty-browsing-context.html
+++ b/tests/wpt/web-platform-tests/portals/portals-activate-empty-browsing-context.html
@@ -4,6 +4,7 @@
 <body>
 <script>
 promise_test(async t => {
+  assert_precondition("HTMLPortalElement" in self);
   let portal = document.createElement('portal');
   document.body.appendChild(portal);
   t.add_cleanup(() => { document.body.removeChild(portal); });
@@ -12,6 +13,7 @@ promise_test(async t => {
 }, "A portal that has never been navigated cannot be activated");
 
 promise_test(async t => {
+  assert_precondition("HTMLPortalElement" in self);
   let portal = document.createElement('portal');
   document.body.appendChild(portal);
   t.add_cleanup(() => { document.body.removeChild(portal); });
diff --git a/tests/wpt/web-platform-tests/portals/portals-activate-inside-iframe.html b/tests/wpt/web-platform-tests/portals/portals-activate-inside-iframe.html
index 4fbe9ba333b..5234babfdf9 100644
--- a/tests/wpt/web-platform-tests/portals/portals-activate-inside-iframe.html
+++ b/tests/wpt/web-platform-tests/portals/portals-activate-inside-iframe.html
@@ -4,6 +4,7 @@
 <body>
   <script>
     promise_test(async t => {
+      assert_precondition("HTMLPortalElement" in self);
       var iframe = document.createElement("iframe");
       iframe.src = "resources/portal-inside-iframe.html"
       var waitForLoad = new Promise((resolve, reject) => {
diff --git a/tests/wpt/web-platform-tests/portals/portals-activate-inside-portal.html b/tests/wpt/web-platform-tests/portals/portals-activate-inside-portal.html
index efeb23d4e38..bd0d9e27bb6 100644
--- a/tests/wpt/web-platform-tests/portals/portals-activate-inside-portal.html
+++ b/tests/wpt/web-platform-tests/portals/portals-activate-inside-portal.html
@@ -4,6 +4,7 @@
 <body>
   <script>
     promise_test(async () => {
+      assert_precondition("HTMLPortalElement" in self);
       var portal = document.createElement("portal");
       portal.src = "resources/portal-activate-inside-portal.html";
       let waitForMessage = new Promise((resolve, reject) => {
diff --git a/tests/wpt/web-platform-tests/portals/portals-activate-no-browsing-context.html b/tests/wpt/web-platform-tests/portals/portals-activate-no-browsing-context.html
index cf5cb35da2f..bfc45f68c18 100644
--- a/tests/wpt/web-platform-tests/portals/portals-activate-no-browsing-context.html
+++ b/tests/wpt/web-platform-tests/portals/portals-activate-no-browsing-context.html
@@ -3,6 +3,7 @@
 <script src="/resources/testharnessreport.js"></script>
 <script>
 promise_test(async t => {
+  assert_precondition("HTMLPortalElement" in self);
   let activatePromise = document.createElement('portal').activate();
   await promise_rejects_dom(t, 'InvalidStateError', activatePromise);
 }, "A portal with nothing in it cannot be activated");
diff --git a/tests/wpt/web-platform-tests/portals/portals-activate-resolution.html b/tests/wpt/web-platform-tests/portals/portals-activate-resolution.html
index db77a990e53..ada8d4619a0 100644
--- a/tests/wpt/web-platform-tests/portals/portals-activate-resolution.html
+++ b/tests/wpt/web-platform-tests/portals/portals-activate-resolution.html
@@ -4,6 +4,7 @@
 <script src="resources/open-blank-host.js"></script>
 <script>
   promise_test(async () => {
+    assert_precondition("HTMLPortalElement" in self);
     var win = await openBlankPortalHost();
     var portal = win.document.createElement("portal");
     portal.src = new URL("resources/simple-portal.html", location.href)
diff --git a/tests/wpt/web-platform-tests/portals/portals-activate-twice.html b/tests/wpt/web-platform-tests/portals/portals-activate-twice.html
index 731a342c7f5..eaef8b7cc94 100644
--- a/tests/wpt/web-platform-tests/portals/portals-activate-twice.html
+++ b/tests/wpt/web-platform-tests/portals/portals-activate-twice.html
@@ -3,6 +3,7 @@
 <script src="/resources/testharnessreport.js"></script>
 <script>
 promise_test(async t => {
+  assert_precondition("HTMLPortalElement" in self);
   let waitForMessage = new Promise((resolve, reject) => {
     window.onmessage = e => resolve(e.data);
   });
@@ -12,6 +13,7 @@ promise_test(async t => {
 }, "Calling activate when a portal is already activating should fail");
 
 promise_test(async t => {
+  assert_precondition("HTMLPortalElement" in self);
   let waitForMessage = new Promise((resolve, reject) => {
     window.onmessage = e => resolve(e.data);
   });
diff --git a/tests/wpt/web-platform-tests/portals/portals-adopt-predecessor.html b/tests/wpt/web-platform-tests/portals/portals-adopt-predecessor.html
index 96d0be9a401..21893987e63 100644
--- a/tests/wpt/web-platform-tests/portals/portals-adopt-predecessor.html
+++ b/tests/wpt/web-platform-tests/portals/portals-adopt-predecessor.html
@@ -13,6 +13,7 @@
   }
 
   promise_test(async () => {
+    assert_precondition("HTMLPortalElement" in self);
     var test = "adopt-once";
     window.open(`resources/portals-adopt-predecessor.html?test=${test}`);
     var message = await waitForCompletion(test);
@@ -20,6 +21,7 @@
   }, "Tests that a portal can adopt its predecessor.");
 
   promise_test(async () => {
+    assert_precondition("HTMLPortalElement" in self);
     var test = "adopt-twice";
     window.open(`resources/portals-adopt-predecessor.html?test=${test}`);
     var message = await waitForCompletion(test);
@@ -27,6 +29,7 @@
   }, "Tests that trying to adopt the predecessor twice will throw an exception.");
 
   async_test(function(t) {
+    assert_precondition("HTMLPortalElement" in self);
     var test = "adopt-after-event";
     var bc = new BroadcastChannel(`test-${test}`);
     bc.onmessage = t.step_func_done(function(e) {
@@ -37,6 +40,7 @@
   }, "Tests that trying to adopt the predecessor after the PortalActivateEvent will throw an exception.");
 
   promise_test(async t => {
+    assert_precondition("HTMLPortalElement" in self);
     var test = "adopt-and-activate";
     window.open(`resources/portals-adopt-predecessor.html?test=${test}`);
     var message = await waitForCompletion(test);
@@ -44,6 +48,7 @@
   }, "Tests that activating an adopted predecessor without inserting it works");
 
   async_test(t => {
+    assert_precondition("HTMLPortalElement" in self);
     var test = "adopt-attach-remove";
     var bc = new BroadcastChannel(`test-${test}`);
     bc.onmessage = t.step_func_done(function(e) {
@@ -54,6 +59,7 @@
   }, "Tests that an adopting, inserting and then removing a predecessor works correctly");
 
   async_test(t => {
+    assert_precondition("HTMLPortalElement" in self);
     var test = "adopt-and-discard";
     var bc = new BroadcastChannel(`test-${test}`);
     bc.onmessage = t.step_func_done(function(e) {
@@ -64,6 +70,7 @@
   }, "Tests that the adopted predecessor is destroyed if it isn't inserted");
 
   async_test(t => {
+    assert_precondition("HTMLPortalElement" in self);
     var test = "adopt-to-disconnected-node";
     var bc = new BroadcastChannel(`test-${test}`);
     bc.onmessage = t.step_func_done(function(e) {
diff --git a/tests/wpt/web-platform-tests/portals/portals-cross-origin-load.sub.html b/tests/wpt/web-platform-tests/portals/portals-cross-origin-load.sub.html
index e19a225de04..be817b8a0aa 100644
--- a/tests/wpt/web-platform-tests/portals/portals-cross-origin-load.sub.html
+++ b/tests/wpt/web-platform-tests/portals/portals-cross-origin-load.sub.html
@@ -4,6 +4,7 @@
 <body>
 <script>
   promise_test(async () => {
+    assert_precondition("HTMLPortalElement" in self);
     var portal = document.createElement("portal");
     portal.src = "http://{{hosts[alt][www]}}:{{ports[http][0]}}/portals/resources/simple-portal.html";
     return new Promise((resolve, reject) => {
diff --git a/tests/wpt/web-platform-tests/portals/portals-focus.sub.html b/tests/wpt/web-platform-tests/portals/portals-focus.sub.html
index 97b7579eb63..54fcf3a3d47 100644
--- a/tests/wpt/web-platform-tests/portals/portals-focus.sub.html
+++ b/tests/wpt/web-platform-tests/portals/portals-focus.sub.html
@@ -8,6 +8,7 @@
 <body>
 <script>
   async function createPortal(doc, url) {
+    assert_precondition("HTMLPortalElement" in self);
     let portal = doc.createElement("portal");
     portal.src = url;
     doc.body.appendChild(portal);
diff --git a/tests/wpt/web-platform-tests/portals/portals-host-exposure.sub.html b/tests/wpt/web-platform-tests/portals/portals-host-exposure.sub.html
index 36fc2b48c8d..3ff88413691 100644
--- a/tests/wpt/web-platform-tests/portals/portals-host-exposure.sub.html
+++ b/tests/wpt/web-platform-tests/portals/portals-host-exposure.sub.html
@@ -4,6 +4,7 @@
 <body>
 <script>
   function openPortalAndReceiveMessage(portalSrc) {
+    assert_precondition("HTMLPortalElement" in self);
     let portal = document.createElement('portal');
     portal.src = portalSrc;
     let received = new Promise((resolve, reject) => {
diff --git a/tests/wpt/web-platform-tests/portals/portals-host-hidden-after-activation.html b/tests/wpt/web-platform-tests/portals/portals-host-hidden-after-activation.html
index f51e54bd49c..571ec55810a 100644
--- a/tests/wpt/web-platform-tests/portals/portals-host-hidden-after-activation.html
+++ b/tests/wpt/web-platform-tests/portals/portals-host-hidden-after-activation.html
@@ -19,6 +19,7 @@
   }
 
   promise_test(async () => {
+    assert_precondition("HTMLPortalElement" in self);
     const portalUrl = encodeURIComponent("portal-host-hidden-after-activation-portal.html");
     window.open(`resources/portal-embed-and-activate.html?url=${portalUrl}`);
     var results = await waitForMessages();
diff --git a/tests/wpt/web-platform-tests/portals/portals-host-post-message.sub.html b/tests/wpt/web-platform-tests/portals/portals-host-post-message.sub.html
index 5331da0d7c3..8750dd43d01 100644
--- a/tests/wpt/web-platform-tests/portals/portals-host-post-message.sub.html
+++ b/tests/wpt/web-platform-tests/portals/portals-host-post-message.sub.html
@@ -17,6 +17,7 @@
     }
 
     async function createPortalAndLoopMessage(portalSrc, params) {
+      assert_precondition("HTMLPortalElement" in self);
       var portal = await createPortal(portalSrc);
       var waitForResponse = new Promise((resolve, reject) => {
         portal.addEventListener("message", e => { resolve(e); });
@@ -72,6 +73,7 @@
     }, "postMessage with object message");
 
     promise_test(async () => {
+      assert_precondition("HTMLPortalElement" in self);
       function checkPort(port) {
         return new Promise((resolve, reject) => {
           var channel = new MessageChannel();
@@ -136,6 +138,7 @@
     }, "postMessage with invalid transferable should throw error");
 
     promise_test(async () => {
+      assert_precondition("HTMLPortalElement" in self);
        var receiveMessage = new Promise((resolve, reject) => {
          var bc = new BroadcastChannel("portal-host-post-message-after-activate");
          bc.onmessage = e => { resolve(e); };
@@ -148,6 +151,7 @@
     }, "Calling postMessage after receiving onactivate event should fail");
 
     promise_test(() => {
+      assert_precondition("HTMLPortalElement" in self);
       var portal = document.createElement("portal");
       portal.src = "resources/portal-host-post-message-navigate-1.html";
       var count = 0;
diff --git a/tests/wpt/web-platform-tests/portals/portals-navigate-after-adoption.html b/tests/wpt/web-platform-tests/portals/portals-navigate-after-adoption.html
index 5ad30d7928a..f4039020313 100644
--- a/tests/wpt/web-platform-tests/portals/portals-navigate-after-adoption.html
+++ b/tests/wpt/web-platform-tests/portals/portals-navigate-after-adoption.html
@@ -27,6 +27,7 @@ async function openPortalAndActivate(logic) {
 }
 
 promise_test(async () => {
+  assert_precondition("HTMLPortalElement" in self);
   let messageFromNewSrc = await openPortalAndActivate(
       'let predecessor = event.adoptPredecessor();' +
       'let readyPromise = new Promise((resolve, reject) => {' +
diff --git a/tests/wpt/web-platform-tests/portals/portals-nested.html b/tests/wpt/web-platform-tests/portals/portals-nested.html
index 9d8d09be9b1..41d053bd48d 100644
--- a/tests/wpt/web-platform-tests/portals/portals-nested.html
+++ b/tests/wpt/web-platform-tests/portals/portals-nested.html
@@ -4,6 +4,7 @@
 <body>
   <script>
     promise_test(() => {
+      assert_precondition("HTMLPortalElement" in self);
       var portal = document.createElement("portal");
       portal.src = "resources/portals-nested-portal.html";
       document.body.appendChild(portal);
diff --git a/tests/wpt/web-platform-tests/portals/portals-post-message.sub.html b/tests/wpt/web-platform-tests/portals/portals-post-message.sub.html
index 5eee95cce65..f3927a0c05a 100644
--- a/tests/wpt/web-platform-tests/portals/portals-post-message.sub.html
+++ b/tests/wpt/web-platform-tests/portals/portals-post-message.sub.html
@@ -12,6 +12,7 @@
     const crossOriginUrl = "http://{{hosts[alt][www]}}:{{ports[http][0]}}/portals/resources/portal-post-message-portal.html"
 
     async function createAndInsertPortal(portalSrc) {
+      assert_precondition("HTMLPortalElement" in self);
       var portal = document.createElement("portal");
       portal.src = portalSrc;
       document.body.append(portal);
@@ -184,6 +185,7 @@
     }
 
     promise_test(async t => {
+      assert_precondition("HTMLPortalElement" in self);
       window.open("resources/portal-post-message-before-activate-window.html");
       let {postMessageTS, activateTS} = await waitForMessage(
           "portals-post-message-before-activate");
@@ -191,12 +193,14 @@
     }, "postMessage before activate should work and preserve order");
 
     promise_test(async t => {
+      assert_precondition("HTMLPortalElement" in self);
       window.open("resources/portal-post-message-during-activate-window.html");
       let error = await waitForMessage("portals-post-message-during-activate");
       assert_equals(error, "InvalidStateError");
     }, "postMessage during activate throws error");
 
     promise_test(async t => {
+      assert_precondition("HTMLPortalElement" in self);
       window.open("resources/portal-post-message-after-activate-window.html");
       let error = await waitForMessage("portals-post-message-after-activate");
       assert_equals(error, "InvalidStateError");
diff --git a/tests/wpt/web-platform-tests/portals/portals-referrer-inherit-header.html b/tests/wpt/web-platform-tests/portals/portals-referrer-inherit-header.html
index 0207474f37d..da908cb2c21 100644
--- a/tests/wpt/web-platform-tests/portals/portals-referrer-inherit-header.html
+++ b/tests/wpt/web-platform-tests/portals/portals-referrer-inherit-header.html
@@ -4,7 +4,7 @@
 <body>
 <script>
 promise_test(async () => {
-  assert_true('HTMLPortalElement' in self, 'HTMLPortalElement is required for this test');
+  assert_precondition('HTMLPortalElement' in self, 'HTMLPortalElement is required for this test');
   let portal = document.createElement('portal');
   let referrerPromise = new Promise((resolve, reject) => {
     portal.addEventListener('message', e => resolve(e.data), {once: true});
diff --git a/tests/wpt/web-platform-tests/portals/portals-referrer-inherit-meta.html b/tests/wpt/web-platform-tests/portals/portals-referrer-inherit-meta.html
index cf0493fb622..eecb247973e 100644
--- a/tests/wpt/web-platform-tests/portals/portals-referrer-inherit-meta.html
+++ b/tests/wpt/web-platform-tests/portals/portals-referrer-inherit-meta.html
@@ -5,7 +5,7 @@
 <body>
 <script>
 promise_test(async () => {
-  assert_true('HTMLPortalElement' in self, 'HTMLPortalElement is required for this test');
+  assert_precondition('HTMLPortalElement' in self, 'HTMLPortalElement is required for this test');
   let portal = document.createElement('portal');
   let referrerPromise = new Promise((resolve, reject) => {
     portal.addEventListener('message', e => resolve(e.data), {once: true});
diff --git a/tests/wpt/web-platform-tests/portals/portals-referrer.html b/tests/wpt/web-platform-tests/portals/portals-referrer.html
index cb08f56def7..b9abcdb80de 100644
--- a/tests/wpt/web-platform-tests/portals/portals-referrer.html
+++ b/tests/wpt/web-platform-tests/portals/portals-referrer.html
@@ -4,7 +4,7 @@
 <body>
 <script>
 promise_test(async () => {
-  assert_true('HTMLPortalElement' in self, 'HTMLPortalElement is required for this test');
+  assert_precondition('HTMLPortalElement' in self, 'HTMLPortalElement is required for this test');
   let portal = document.createElement('portal');
   let referrerPromise = new Promise((resolve, reject) => {
     portal.addEventListener('message', e => resolve(e.data), {once: true});
@@ -21,7 +21,7 @@ promise_test(async () => {
 }, "portal contents should be loaded with referrer");
 
 promise_test(async () => {
-  assert_true('HTMLPortalElement' in self, 'HTMLPortalElement is required for this test');
+  assert_precondition('HTMLPortalElement' in self, 'HTMLPortalElement is required for this test');
   let portal = document.createElement('portal');
   portal.referrerPolicy = 'no-referrer';
   let referrerPromise = new Promise((resolve, reject) => {
@@ -39,7 +39,7 @@ promise_test(async () => {
 }, "portal contents should be loaded with no referrer if referrerpolicy=no-referrer");
 
 promise_test(async () => {
-  assert_true('HTMLPortalElement' in self, 'HTMLPortalElement is required for this test');
+  assert_precondition('HTMLPortalElement' in self, 'HTMLPortalElement is required for this test');
   let portal = document.createElement('portal');
   portal.referrerPolicy = 'origin';
   let referrerPromise = new Promise((resolve, reject) => {
diff --git a/tests/wpt/web-platform-tests/portals/portals-rendering.html b/tests/wpt/web-platform-tests/portals/portals-rendering.html
index 0eae0ddfd6e..229dacf4e69 100644
--- a/tests/wpt/web-platform-tests/portals/portals-rendering.html
+++ b/tests/wpt/web-platform-tests/portals/portals-rendering.html
@@ -2,16 +2,21 @@
 <html class="reftest-wait">
 <title>Portals rendering test</title>
 <link rel="match" href="references/portals-rendering.html">
-<body>
-  <script>
-    var portal = document.createElement('portal');
-    portal.src = 'resources/portals-rendering-portal.html';
-    portal.style = 'background-color: red; width: 100px; height: 100px';
-    portal.onmessage = e => {
-      window.requestAnimationFrame(function(ts) {
-        document.documentElement.classList.remove('reftest-wait');
-      });
-    }
-    document.body.appendChild(portal);
-  </script>
-</body>
+<body></body>
+<script>
+if (!("HTMLPortalElement" in self)) {
+  document.body.textContent = "PRECONDITION FAILED";
+  document.documentElement.classList.remove('reftest-wait');
+} else {
+  var portal = document.createElement('portal');
+  portal.src = 'resources/portals-rendering-portal.html';
+  portal.style = 'background-color: red; width: 100px; height: 100px';
+  portal.onmessage = e => {
+    window.requestAnimationFrame(function(ts) {
+      document.documentElement.classList.remove('reftest-wait');
+    });
+  };
+  document.body.appendChild(portal);
+}
+</script>
+
diff --git a/tests/wpt/web-platform-tests/portals/portals-repeated-activate.html b/tests/wpt/web-platform-tests/portals/portals-repeated-activate.html
index a3843dddb47..bf8d8ad4264 100644
--- a/tests/wpt/web-platform-tests/portals/portals-repeated-activate.html
+++ b/tests/wpt/web-platform-tests/portals/portals-repeated-activate.html
@@ -2,7 +2,8 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
-  async_test(async t => {
+  async_test(t => {
+    assert_precondition("HTMLPortalElement" in self);
     let win = window.open("resources/portal-repeated-activate-window.html");
     win.onload = () => win.activate();
     window.onmessage = t.step_func_done(() => {});
diff --git a/tests/wpt/web-platform-tests/portals/portals-set-src-after-activate.html b/tests/wpt/web-platform-tests/portals/portals-set-src-after-activate.html
index 70a16436a67..f9728170858 100644
--- a/tests/wpt/web-platform-tests/portals/portals-set-src-after-activate.html
+++ b/tests/wpt/web-platform-tests/portals/portals-set-src-after-activate.html
@@ -10,6 +10,7 @@ function nextMessage(target) {
 }
 
 promise_test(async () => {
+  assert_precondition("HTMLPortalElement" in self);
   const w = await openBlankPortalHost();
   try {
     const portal = w.document.createElement('portal');
diff --git a/tests/wpt/web-platform-tests/portals/predecessor-fires-unload.html b/tests/wpt/web-platform-tests/portals/predecessor-fires-unload.html
index 381221222b5..dce2afb8e6f 100644
--- a/tests/wpt/web-platform-tests/portals/predecessor-fires-unload.html
+++ b/tests/wpt/web-platform-tests/portals/predecessor-fires-unload.html
@@ -12,6 +12,7 @@ function timePasses(delay) {
 }
 
 promise_test(async () => {
+  assert_precondition("HTMLPortalElement" in self);
   const w = await openBlankPortalHost();
   try {
     const portal = w.document.createElement('portal');
@@ -29,6 +30,7 @@ promise_test(async () => {
 }, "pagehide and unload should fire if the predecessor is not adopted");
 
 promise_test(async () => {
+  assert_precondition("HTMLPortalElement" in self);
   localStorage.setItem('predecessor-fires-unload-events', '');
   window.open('resources/predecessor-fires-unload-watch-unload.html', '_blank', 'noopener');
   while (localStorage.getItem('predecessor-fires-unload-events') != 'pagehide unload') {
diff --git a/tests/wpt/web-platform-tests/portals/xfo/portals-xfo-deny.sub.html b/tests/wpt/web-platform-tests/portals/xfo/portals-xfo-deny.sub.html
index 13c3f7f4d1f..dde09c6e72b 100644
--- a/tests/wpt/web-platform-tests/portals/xfo/portals-xfo-deny.sub.html
+++ b/tests/wpt/web-platform-tests/portals/xfo/portals-xfo-deny.sub.html
@@ -8,6 +8,7 @@
 // completion event.
 
 async_test(t => {
+  assert_precondition("HTMLPortalElement" in self);
   var portal = document.createElement('portal');
   portal.src = "/portals/xfo/resources/xfo-deny.asis";
   portal.onmessage = t.unreached_func("should not have received a message");
@@ -17,6 +18,7 @@ async_test(t => {
 }, "`XFO: DENY` blocks same-origin portals.");
 
 async_test(t => {
+  assert_precondition("HTMLPortalElement" in self);
   var portal = document.createElement('portal');
   portal.src = "http://{{domains[www]}}:{{ports[http][0]}}/portals/xfo/resources/xfo-deny.asis";
   portal.onmessage = t.unreached_func("should not have received a message");
diff --git a/tests/wpt/web-platform-tests/resize-observer/observe.html b/tests/wpt/web-platform-tests/resize-observer/observe.html
index 3b336837b3b..1ab5f786877 100644
--- a/tests/wpt/web-platform-tests/resize-observer/observe.html
+++ b/tests/wpt/web-platform-tests/resize-observer/observe.html
@@ -713,6 +713,138 @@ function test16() {
   ]);
 
   return helper.start(() => t.remove());
+
+}
+
+
+function test17() {
+  // <div id="outer">
+  //   <div id="nested">
+  //   </div>
+  // </div>
+
+  let outer = document.createElement('div');
+  outer.style.width = "100px";
+  outer.style.height = "100px";
+  outer.style.padding = "10px";
+  outer.style.border = "1px solid blue"
+  let nested = document.createElement('div');
+  nested.style.width = "60px";
+  nested.style.height = "50px";
+  nested.style.padding = "5%";
+  nested.style.boxSizing = "border-box";
+  nested.style.border = "5px solid black";
+  outer.appendChild(nested);
+  document.body.appendChild(outer);
+
+  let helper = new ResizeTestHelper(
+    "test17: Box sizing snd Resize Observer notifications",
+  [
+    {
+      setup: observer => {
+        observer.observe(nested, { box: "content-box" });
+      },
+      notify: entries => {
+        assert_equals(entries.length, 1, "1 pending notification");
+        assert_equals(entries[0].target, nested, "target is nested");
+        assert_equals(entries[0].contentRect.width, 40, "target width");
+        assert_equals(entries[0].contentRect.height, 30, "target height");
+        assert_equals(entries[0].contentRect.top, 5, "target top padding");
+        assert_equals(entries[0].contentRect.left, 5, "target left padding");
+        assert_equals(entries[0].contentBoxSize.inlineSize, 40,
+                      "target content-box inline size");
+        assert_equals(entries[0].contentBoxSize.blockSize, 30,
+                      "target content-box block size");
+        assert_equals(entries[0].borderBoxSize.inlineSize, 60,
+                      "target border-box inline size");
+        assert_equals(entries[0].borderBoxSize.blockSize, 50,
+                      "target border-box block size");
+      }
+    },
+    {
+      // Changes to a parent's dimensions with a child's padding set as a percentage
+      // should fire observation if content-box is being observed
+      setup: observer => {
+        outer.style.height = "200px";
+        outer.style.width = "200px";
+      },
+      notify: entries => {
+        assert_equals(entries.length, 1, "1 pending notification");
+        assert_equals(entries[0].target, nested, "target is nested");
+        assert_equals(entries[0].contentRect.width, 30, "target width");
+        assert_equals(entries[0].contentRect.height, 20, "target height");
+        assert_equals(entries[0].contentRect.top, 10, "target top padding");
+        assert_equals(entries[0].contentRect.left, 10, "target left padding");
+        assert_equals(entries[0].contentBoxSize.inlineSize, 30,
+                      "target content-box inline size");
+        assert_equals(entries[0].contentBoxSize.blockSize, 20,
+                      "target content-box block size");
+        assert_equals(entries[0].borderBoxSize.inlineSize, 60,
+                      "target border-box inline size");
+        assert_equals(entries[0].borderBoxSize.blockSize, 50,
+                      "target border-box block size");
+      }
+    },
+    {
+      // Changes to a parent's dimensions with a child's padding set as a percentage
+      // should fire observation if content-box is being observed
+      setup: observer => {
+        nested.style.border = "1px solid black";
+      },
+      notify: entries => {
+        assert_equals(entries.length, 1, "1 pending notification");
+        assert_equals(entries[0].target, nested, "target is nested");
+        assert_equals(entries[0].contentRect.width, 38, "target width");
+        assert_equals(entries[0].contentRect.height, 28, "target height");
+        assert_equals(entries[0].contentRect.top, 10, "target top padding");
+        assert_equals(entries[0].contentRect.left, 10, "target left padding");
+        assert_equals(entries[0].contentBoxSize.inlineSize, 38,
+                      "target content-box inline size");
+        assert_equals(entries[0].contentBoxSize.blockSize, 28,
+                      "target content-box block size");
+        assert_equals(entries[0].borderBoxSize.inlineSize, 60,
+                      "target border-box inline size");
+        assert_equals(entries[0].borderBoxSize.blockSize, 50,
+                      "target border-box block size");
+      }
+    },
+    {
+      setup: observer => {
+        observer.observe(nested, { box: "border-box" });
+      },
+      notify: entries => {
+        assert_equals(entries.length, 1, "1 pending notification");
+        assert_equals(entries[0].target, nested, "target is nested");
+        assert_equals(entries[0].contentRect.width, 38, "target width");
+        assert_equals(entries[0].contentRect.height, 28, "target height");
+        assert_equals(entries[0].contentRect.top, 10, "target top padding");
+        assert_equals(entries[0].contentRect.left, 10, "target left padding");
+        assert_equals(entries[0].contentBoxSize.inlineSize, 38,
+                      "target content-box inline size");
+        assert_equals(entries[0].contentBoxSize.blockSize, 28,
+                      "target content-box block size");
+        assert_equals(entries[0].borderBoxSize.inlineSize, 60,
+                      "target border-box inline size");
+        assert_equals(entries[0].borderBoxSize.blockSize, 50,
+                      "target border-box block size");
+      }
+    },
+    {
+      // Changes to a parent's dimensions with a child's padding set as a percentage
+      // should not fire observation if border-box is being observed
+      setup: observer => {
+        outer.style.height = "100px";
+      },
+      notify: entries => {
+        assert_unreached("No observation should be fired when nested border box remains constant");
+      },
+      timeout: () => {
+        // expected
+      }
+    },
+
+  ]);
+  return helper.start(() => nested.remove());
 }
 
 let guard;
@@ -738,6 +870,7 @@ test0()
   .then(() => test14())
   .then(() => test15())
   .then(() => test16())
+  .then(() => test17())
   .then(() => guard.done());
 
 </script>
diff --git a/tests/wpt/web-platform-tests/resources/LICENSE b/tests/wpt/web-platform-tests/resources/LICENSE
deleted file mode 100644
index 45896e6be2b..00000000000
--- a/tests/wpt/web-platform-tests/resources/LICENSE
+++ /dev/null
@@ -1,30 +0,0 @@
-W3C 3-clause BSD License
-
-http://www.w3.org/Consortium/Legal/2008/03-bsd-license.html
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of works must retain the original copyright notice,
-  this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the original copyright
-  notice, this list of conditions and the following disclaimer in the
-  documentation and/or other materials provided with the distribution.
-
-* Neither the name of the W3C nor the names of its contributors may be
-  used to endorse or promote products derived from this work without
-  specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/tests/wpt/web-platform-tests/resources/chromium/webxr-test.js b/tests/wpt/web-platform-tests/resources/chromium/webxr-test.js
index be8be8067e9..dee05d08ff8 100644
--- a/tests/wpt/web-platform-tests/resources/chromium/webxr-test.js
+++ b/tests/wpt/web-platform-tests/resources/chromium/webxr-test.js
@@ -1012,6 +1012,9 @@ class MockXRInputSource {
       this.primary_input_clicked_ = fakeInputSourceInit.selectionClicked;
     }
 
+    this.primary_squeeze_pressed_ = false;
+    this.primary_squeeze_clicked_ = false;
+
     this.mojo_from_input_ = null;
     if (fakeInputSourceInit.gripOrigin != null) {
       this.setGripOrigin(fakeInputSourceInit.gripOrigin);
@@ -1163,6 +1166,20 @@ class MockXRInputSource {
       throw new Error("Unknown Button Type!");
     }
 
+    // is this a 'squeeze' button?
+    if (buttonIndex === this.getButtonIndex('grip')) {
+      // squeeze
+      if (buttonState.pressed) {
+        this.primary_squeeze_pressed_ = true;
+      } else if (this.gamepad_.buttons[buttonIndex].pressed) {
+        this.primary_squeeze_clicked_ = true;
+        this.primary_squeeze_pressed_ = false;
+      } else {
+        this.primary_squeeze_clicked_ = false;
+        this.primary_squeeze_pressed_ = false;
+      }
+    }
+
     this.gamepad_.buttons[buttonIndex].pressed = buttonState.pressed;
     this.gamepad_.buttons[buttonIndex].touched = buttonState.touched;
     this.gamepad_.buttons[buttonIndex].value = buttonState.pressedValue;
@@ -1181,10 +1198,17 @@ class MockXRInputSource {
 
     input_state.primaryInputPressed = this.primary_input_pressed_;
     input_state.primaryInputClicked = this.primary_input_clicked_;
+
+    input_state.primarySqueezePressed = this.primary_squeeze_pressed_;
+    input_state.primarySqueezeClicked = this.primary_squeeze_clicked_;
     // Setting the input source's "clicked" state should generate one "select"
     // event. Reset the input value to prevent it from continuously generating
     // events.
     this.primary_input_clicked_ = false;
+    // Setting the input source's "clicked" state should generate one "squeeze"
+    // event. Reset the input value to prevent it from continuously generating
+    // events.
+    this.primary_squeeze_clicked_ = false;
 
     input_state.mojoFromInput = this.mojo_from_input_;
 
@@ -1233,6 +1257,7 @@ class MockXRInputSource {
     // Pointer data for DOM Overlay, set by setOverlayPointerPosition()
     if (this.overlay_pointer_position_) {
       input_state.overlayPointerPosition = this.overlay_pointer_position_;
+      this.overlay_pointer_position_ = null;
     }
 
     return input_state;
diff --git a/tests/wpt/web-platform-tests/resources/idlharness.js b/tests/wpt/web-platform-tests/resources/idlharness.js
index 18b11ec506d..ff40847a1fc 100644
--- a/tests/wpt/web-platform-tests/resources/idlharness.js
+++ b/tests/wpt/web-platform-tests/resources/idlharness.js
@@ -2406,10 +2406,7 @@ IdlInterface.prototype.test_member_operation = function(member)
     if (!shouldRunSubTest(this.name)) {
         return;
     }
-    var a_test = subsetTestByKey(this.name, async_test, this.name + " interface: operation " + member.name +
-                            "(" + member.arguments.map(
-                                function(m) {return m.idlType.idlType; } ).join(", ")
-                            +")");
+    var a_test = subsetTestByKey(this.name, async_test, this.name + " interface: operation " + member);
     a_test.step(function()
     {
         // This function tests WebIDL as of 2015-12-29.
@@ -2883,11 +2880,6 @@ IdlInterface.prototype.test_interface_of = function(desc, obj, exception, expect
         || member.type == "operation")
         && member.name)
         {
-            var described_name = member.name;
-            if (member.type == "operation")
-            {
-                described_name += "(" + member.arguments.map(arg => arg.idlType.idlType).join(", ") + ")";
-            }
             subsetTestByKey(this.name, test, function()
             {
                 assert_equals(exception, null, "Unexpected exception when evaluating object");
@@ -2927,16 +2919,17 @@ IdlInterface.prototype.test_interface_of = function(desc, obj, exception, expect
                         assert_equals(typeof obj[member.name], "function");
                     }
                 }
-            }.bind(this), this.name + " interface: " + desc + ' must inherit property "' + described_name + '" with the proper type');
+            }.bind(this), this.name + " interface: " + desc + ' must inherit property "' + member + '" with the proper type');
         }
         // TODO: This is wrong if there are multiple operations with the same
         // identifier.
         // TODO: Test passing arguments of the wrong type.
         if (member.type == "operation" && member.name && member.arguments.length)
         {
-            var a_test = subsetTestByKey(this.name, async_test, this.name + " interface: calling " + member.name +
-            "(" + member.arguments.map(function(m) { return m.idlType.idlType; }).join(", ") +
-            ") on " + desc + " with too few arguments must throw TypeError");
+            var description =
+                this.name + " interface: calling " + member + " on " + desc +
+                " with too few arguments must throw TypeError";
+            var a_test = subsetTestByKey(this.name, async_test, description);
             a_test.step(function()
             {
                 assert_equals(exception, null, "Unexpected exception when evaluating object");
@@ -3150,6 +3143,36 @@ IdlInterfaceMember.prototype.is_to_json_regular_operation = function() {
     return this.type == "operation" && this.special !== "static" && this.name == "toJSON";
 };
 
+IdlInterfaceMember.prototype.toString = function() {
+    function formatType(type) {
+        var result;
+        if (type.generic) {
+            result = type.generic + "<" + type.idlType.map(formatType).join(", ") + ">";
+        } else if (type.union) {
+            result = "(" + type.subtype.map(formatType).join(" or ") + ")";
+        } else {
+            result = type.idlType;
+        }
+        if (type.nullable) {
+            result += "?"
+        }
+        return result;
+    }
+
+    if (this.type === "operation") {
+        var args = this.arguments.map(function(m) {
+            return [
+                m.optional ? "optional " : "",
+                formatType(m.idlType),
+                m.variadic ? "..." : "",
+            ].join("");
+        }).join(", ");
+        return this.name + "(" + args + ")";
+    }
+
+    return this.name;
+}
+
 /// Internal helper functions ///
 function create_suitable_object(type)
 {
@@ -3294,17 +3317,10 @@ IdlNamespace.prototype.test_member_operation = function(member)
     if (!shouldRunSubTest(this.name)) {
         return;
     }
-    var args = member.arguments.map(function(a) {
-        var s = a.idlType.idlType;
-        if (a.variadic) {
-            s += '...';
-        }
-        return s;
-    }).join(", ");
     var a_test = subsetTestByKey(
         this.name,
         async_test,
-        this.name + ' namespace: operation ' + member.name + '(' + args + ')');
+        this.name + ' namespace: operation ' + member);
     a_test.step(function() {
         assert_own_property(
             self[this.name],
diff --git a/tests/wpt/web-platform-tests/resources/test/tests/functional/api-tests-1.html b/tests/wpt/web-platform-tests/resources/test/tests/functional/api-tests-1.html
index 05b570a6d0a..7c77afdda8e 100644
--- a/tests/wpt/web-platform-tests/resources/test/tests/functional/api-tests-1.html
+++ b/tests/wpt/web-platform-tests/resources/test/tests/functional/api-tests-1.html
@@ -194,6 +194,33 @@
         assert_throws_dom("SyntaxError", function () {document.querySelector("")});
     }, "Test throw DOM SyntaxError")
 
+    test(function()
+    {
+        var ifr = document.createElement("iframe");
+        document.body.appendChild(ifr);
+        this.add_cleanup(() => ifr.remove());
+        assert_throws_dom("SyntaxError", ifr.contentWindow.DOMException,
+                          function () {ifr.contentDocument.querySelector("")});
+    }, "Test throw DOM SyntaxError from subframe");
+
+    test(function()
+    {
+        var ifr = document.createElement("iframe");
+        document.body.appendChild(ifr);
+        this.add_cleanup(() => ifr.remove());
+        assert_throws_dom("SyntaxError",
+                          function () {ifr.contentDocument.querySelector("")});
+    }, "Test throw DOM SyntaxError from subframe with incorrect global expectation; expected to fail");
+
+    test(function()
+    {
+        var ifr = document.createElement("iframe");
+        document.body.appendChild(ifr);
+        this.add_cleanup(() => ifr.remove());
+        assert_throws_dom("SyntaxError", ifr.contentWindow.DOMException,
+                          function () {document.querySelector("")});
+    }, "Test throw DOM SyntaxError with incorrect expectation; expected to fail");
+
     test(function()
     {
         assert_throws_dom("SyntaxError", function () {JSON.parse("{")});
@@ -214,13 +241,15 @@
 
     test(function()
     {
-        var e = {code:0, name:"TEST_ERR", TEST_ERR:0}
+        var e = {code:0, name:"TEST_ERR", TEST_ERR:0};
+        e.constructor = DOMException;
         assert_throws_dom("TEST_ERR", function() {throw e});
     }, "Test assert_throws_dom with non-DOM-exception expected to Fail");
 
     test(function()
     {
-        var e = {code: DOMException.SYNTAX_ERR, name:"SyntaxError"}
+        var e = {code: DOMException.SYNTAX_ERR, name:"SyntaxError"};
+        e.constructor = DOMException;
         assert_throws_dom(DOMException.SYNTAX_ERR, function() {throw e});
     }, "Test assert_throws_dom with number code value expected to Pass");
 
@@ -358,6 +387,24 @@
       "message": null,
       "properties": {}
     },
+    {
+      "status_string": "PASS",
+      "name": "Test throw DOM SyntaxError from subframe",
+      "message": null,
+      "properties": {}
+    },
+    {
+      "status_string": "FAIL",
+      "name": "Test throw DOM SyntaxError from subframe with incorrect global expectation; expected to fail",
+      "message": "assert_throws_dom: function \"function () {ifr.contentDocument.querySelector(\"\")}\" threw an exception from the wrong global",
+      "properties": {}
+    },
+    {
+      "status_string": "FAIL",
+      "name": "Test throw DOM SyntaxError with incorrect expectation; expected to fail",
+      "message": "assert_throws_dom: function \"function () {document.querySelector(\"\")}\" threw an exception from the wrong global",
+      "properties": {}
+    },
     {
       "status_string": "FAIL",
       "name": "Test throw JS SyntaxError where SyntaxError DOMException expected; expected to fail",
diff --git a/tests/wpt/web-platform-tests/resources/test/tests/unit/IdlInterfaceMember/toString.html b/tests/wpt/web-platform-tests/resources/test/tests/unit/IdlInterfaceMember/toString.html
new file mode 100644
index 00000000000..779c7a15e6d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/resources/test/tests/unit/IdlInterfaceMember/toString.html
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+<title>IdlInterfaceMember.prototype.toString()</title>
+</head>
+<body>
+<div id="log"></div>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/WebIDLParser.js"></script>
+<script src="/resources/idlharness.js"></script>
+<script src="../../../idl-helper.js"></script>
+<script>
+"use strict";
+const tests = [
+    ["long x", "long"],
+    ["long? x", "long?"],
+    ["Promise<long> x", "Promise<long>"],
+    ["Promise<long?> x", "Promise<long?>"],
+    ["sequence<long> x", "sequence<long>"],
+    ["(long or DOMString) x", "(long or DOMString)"],
+    ["long x, boolean y", "long, boolean"],
+    ["long x, optional boolean y", "long, optional boolean"],
+    ["long... args", "long..."],
+    ["sequence<long>... args", "sequence<long>..."],
+    ["(long or DOMString)... args", "(long or DOMString)..."],
+];
+for (const [input, output] of tests) {
+    test(function() {
+        var m = memberFrom(`void foo(${input})`);
+        assert_equals(m.toString(), `foo(${output})`);
+    }, `toString for ${input}`);
+}
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/resources/testharness.js b/tests/wpt/web-platform-tests/resources/testharness.js
index 7a0e4872899..0ec232c1d27 100644
--- a/tests/wpt/web-platform-tests/resources/testharness.js
+++ b/tests/wpt/web-platform-tests/resources/testharness.js
@@ -645,10 +645,42 @@ policies and contribution forms [3].
         });
     }
 
-    function promise_rejects_dom(test, type, promise, description) {
+    /**
+     * Assert that a Promise is rejected with the right DOMException.
+     *
+     * @param test the test argument passed to promise_test
+     * @param {number|string} type.  See documentation for assert_throws_dom.
+     *
+     * For the remaining arguments, there are two ways of calling
+     * promise_rejects_dom:
+     *
+     * 1) If the DOMException is expected to come from the current global, the
+     * third argument should be the promise expected to reject, and a fourth,
+     * optional, argument is the assertion description.
+     *
+     * 2) If the DOMException is expected to come from some other global, the
+     * third argument should be the DOMException constructor from that global,
+     * the fourth argument the promise expected to reject, and the fifth,
+     * optional, argument the assertion description.
+     */
+
+    function promise_rejects_dom(test, type, promiseOrConstructor, descriptionOrPromise, maybeDescription) {
+        let constructor, promise, description;
+        if (typeof promiseOrConstructor === "function" &&
+            promiseOrConstructor.name === "DOMException") {
+            constructor = promiseOrConstructor;
+            promise = descriptionOrPromise;
+            description = maybeDescription;
+        } else {
+            constructor = self.DOMException;
+            promise = promiseOrConstructor;
+            description = descriptionOrPromise;
+            assert(maybeDescription === undefined,
+                   "Too many args pased to no-constructor version of promise_rejects_dom");
+        }
         return promise.then(test.unreached_func("Should have rejected: " + description)).catch(function(e) {
-            assert_throws_dom_impl(type, function() { throw e },
-                                   description, "promise_rejects_dom");
+            assert_throws_dom_impl(type, function() { throw e }, description,
+                                   "promise_rejects_dom", constructor);
         });
     }
 
@@ -1541,20 +1573,44 @@ policies and contribution forms [3].
      *        either be an exception name (e.g. "HierarchyRequestError",
      *        "WrongDocumentError") or the name of the corresponding error code
      *        (e.g. "HIERARCHY_REQUEST_ERR", "WRONG_DOCUMENT_ERR").
-     * @param {Function} func Function which should throw.
-     * @param {string} description Error description for the case that the error is not thrown.
+     *
+     * For the remaining arguments, there are two ways of calling
+     * promise_rejects_dom:
+     *
+     * 1) If the DOMException is expected to come from the current global, the
+     * second argument should be the function expected to throw and a third,
+     * optional, argument is the assertion description.
+     *
+     * 2) If the DOMException is expected to come from some other global, the
+     * second argument should be the DOMException constructor from that global,
+     * the third argument the function expected to throw, and the fourth, optional,
+     * argument the assertion description.
      */
-    function assert_throws_dom(type, func, description)
+    function assert_throws_dom(type, funcOrConstructor, descriptionOrFunc, maybeDescription)
     {
-        assert_throws_dom_impl(type, func, description, "assert_throws_dom")
+        let constructor, func, description;
+        if (funcOrConstructor.name === "DOMException") {
+            constructor = funcOrConstructor;
+            func = descriptionOrFunc;
+            description = maybeDescription;
+        } else {
+            constructor = self.DOMException;
+            func = funcOrConstructor;
+            description = descriptionOrFunc;
+            assert(maybeDescription === undefined,
+                   "Too many args pased to no-constructor version of assert_throws_dom");
+        }
+        assert_throws_dom_impl(type, func, description, "assert_throws_dom", constructor)
     }
     expose(assert_throws_dom, "assert_throws_dom");
 
     /**
-     * Like assert_throws_dom but allows specifying the assertion type
-     * (assert_throws_dom or promise_rejects_dom, in practice).
+     * Similar to assert_throws_dom but allows specifying the assertion type
+     * (assert_throws_dom or promise_rejects_dom, in practice).  The
+     * "constructor" argument must be the DOMException constructor from the
+     * global we expect the exception to come from.
      */
-    function assert_throws_dom_impl(type, func, description, assertion_type)
+    function assert_throws_dom_impl(type, func, description, assertion_type, constructor)
     {
         try {
             func.call(this);
@@ -1565,6 +1621,7 @@ policies and contribution forms [3].
                 throw e;
             }
 
+            // Basic sanity-checks on the thrown exception.
             assert(typeof e === "object",
                    assertion_type, description,
                    "${func} threw ${e} with type ${type}, not an object",
@@ -1678,19 +1735,21 @@ policies and contribution forms [3].
                 required_props.name = name;
             }
 
-            //We'd like to test that e instanceof the appropriate interface,
-            //but we can't, because we don't know what window it was created
-            //in.  It might be an instanceof the appropriate interface on some
-            //unknown other window.  TODO: Work around this somehow?  Maybe have
-            //the first arg just be a DOMException with the right name instead
-            //of the string-or-code thing we have now?
-
             for (var prop in required_props) {
                 assert(prop in e && e[prop] == required_props[prop],
                        assertion_type, description,
                        "${func} threw ${e} that is not a DOMException " + type + ": property ${prop} is equal to ${actual}, expected ${expected}",
                        {func:func, e:e, prop:prop, actual:e[prop], expected:required_props[prop]});
             }
+
+            // Check that the exception is from the right global.  This check is last
+            // so more specific, and more informative, checks on the properties can
+            // happen in case a totally incorrect exception is thrown.
+            assert(e.constructor === constructor,
+                   assertion_type, description,
+                   "${func} threw an exception from the wrong global",
+                   {func});
+
         }
     }
 
diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-animation.html b/tests/wpt/web-platform-tests/scroll-animations/scroll-animation.html
index 7a6f8757440..62e5bb854aa 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/scroll-animation.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/scroll-animation.html
@@ -135,4 +135,28 @@ promise_test(async t => {
       "The start time is zero in Playing state.");
 }, 'Animation start and current times are correct when multiple animations' +
     ' are attached to the same timeline.');
+
+promise_test(async t => {
+    const animation = createScrollLinkedAnimation(t);
+    const scroller = animation.timeline.scrollSource;
+    // Make the scroll timeline inactive.
+    scroller.style.overflow = "visible";
+    // Trigger layout;
+    scroller.scrollTop;
+    assert_equals(animation.timeline.currentTime, null,
+      "Timeline current time is null in inactive state.");
+    // Play the animation when the timeline is inactive.
+    animation.play();
+    // Make the scroll timeline active.
+    scroller.style.overflow = "auto";
+    await animation.ready;
+    // Ready promise is resolved as a result of the timeline becoming active.
+    assert_equals(animation.timeline.currentTime, 0,
+      "Timeline current time is resolved in active state.");
+    assert_equals(animation.currentTime, 0,
+      "Animation current time is resolved when the animation is ready.");
+    assert_equals(animation.startTime, 0,
+      "Animation start time is resolved when the animation is ready.");
+}, 'Animation start and current times are correct if scroll timeline is ' +
+   'activated after animation.play call.');
 </script>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/scroll-to-text-fragment-target.html b/tests/wpt/web-platform-tests/scroll-to-text-fragment/scroll-to-text-fragment-target.html
index b06f3c889c1..b2be85132cb 100644
--- a/tests/wpt/web-platform-tests/scroll-to-text-fragment/scroll-to-text-fragment-target.html
+++ b/tests/wpt/web-platform-tests/scroll-to-text-fragment/scroll-to-text-fragment-target.html
@@ -74,7 +74,11 @@ window.onload = function() {
 </style>
 <body>
   <div id="element" class="scroll-section">Element</div>
-  <p id="text" class="scroll-section">This is a test page !$'()*+./:;=?@_~ &,- &#x30cd;&#x30b3;</p>
+  <p id="text" class="scroll-section">
+    This is a test page !$'()*+./:;=?@_~ &,- &#x30cd;&#x30b3;
+    <br>
+    foo foo foo bar bar bar
+  </p>
   <p id="more-text" class="scroll-section">More test page text</p>
   <div class="scroll-section">
     <div>
diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/scroll-to-text-fragment.html b/tests/wpt/web-platform-tests/scroll-to-text-fragment/scroll-to-text-fragment.html
index f0b167a9051..73931d4b0e6 100644
--- a/tests/wpt/web-platform-tests/scroll-to-text-fragment/scroll-to-text-fragment.html
+++ b/tests/wpt/web-platform-tests/scroll-to-text-fragment/scroll-to-text-fragment.html
@@ -61,6 +61,12 @@ let test_cases = [
     expect_position: 'text',
     description: 'Exact text with prefix and suffix should match text'
   },
+  // Test tricky edge case where prefix and query are equal
+  {
+    fragment: '#:~:text=foo-,foo,-bar',
+    expect_position: 'text',
+    description: 'Exact text with prefix and suffix and query equals prefix.'
+  },
   // Test text range matching, with all combinations of context terms
   {
     fragment: '#:~:text=this,page',
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/detached-context.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/detached-context.https.html
index c9015b80930..cbb818f7ac0 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/detached-context.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/detached-context.https.html
@@ -75,12 +75,14 @@ promise_test(t => {
       .then(() => { return with_iframe(scope); })
       .then(frame => {
           const worker = frame.contentWindow.navigator.serviceWorker.controller;
+          const ctor = frame.contentWindow.DOMException;
           frame.remove();
           assert_equals(worker.scriptURL, normalizeURL(script));
           assert_equals(worker.state, 'activated');
           worker.onstatechange = () => { /* empty */ };
           assert_throws_dom(
               'InvalidStateError',
+               ctor,
               () => { worker.postMessage(''); },
               'postMessage on a detached client should throw an exception.');
         });
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-handled.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-handled.https.html
new file mode 100644
index 00000000000..2d6f6c86d87
--- /dev/null
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-handled.https.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<html>
+<title>Service Worker: FetchEvent.handled</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/test-helpers.sub.js"></script>
+<script>
+
+let frame = null;
+let worker = null;
+const script = 'resources/fetch-event-handled-worker.js';
+const scope = 'resources/simple.html';
+
+// Wait for a message from the service worker and removes the message handler.
+function wait_for_message_from_worker() {
+  return new Promise((resolve) => {
+    const handler = (event) => {
+      frame.contentWindow.navigator.serviceWorker.removeEventListener(
+          'message', handler);
+      resolve(event.data);
+    };
+    frame.contentWindow.navigator.serviceWorker.addEventListener(
+        'message', handler);
+  });
+}
+
+// Global setup: this must be the first promise_test.
+promise_test(async (t) => {
+  const registration =
+      await service_worker_unregister_and_register(t, script, scope);
+  worker = registration.installing;
+  await wait_for_state(t, worker, 'activated');
+  frame = await with_iframe(scope);
+}, 'global setup');
+
+promise_test(async (t) => {
+  frame.contentWindow.fetch('dummy.txt?respondWith-not-called');
+  const message = await wait_for_message_from_worker();
+  assert_equals(message, 'RESOLVED');
+}, 'FetchEvent.handled should resolve when respondWith() is not called');
+
+promise_test(async (t) => {
+  frame.contentWindow.fetch(
+      'dummy.txt?respondWith-not-called-and-event-canceled').catch((e) => {});
+  const message = await wait_for_message_from_worker();
+  assert_equals(message, 'REJECTED');
+}, 'FetchEvent.handled should reject when respondWith() is not called and the' +
+    ' event is canceled');
+
+promise_test(async (t) => {
+  frame.contentWindow.fetch(
+      'dummy.txt?respondWith-called-and-promise-resolved');
+  const message = await wait_for_message_from_worker();
+  assert_equals(message, 'RESOLVED');
+}, 'FetchEvent.handled should resolve when the promise provided' +
+    ' to respondWith() is resolved');
+
+promise_test(async (t) => {
+  frame.contentWindow.fetch(
+      'dummy.txt?respondWith-called-and-promise-resolved-to-invalid-response')
+      .catch((e) => {});
+  const message = await wait_for_message_from_worker();
+  assert_equals(message, 'REJECTED');
+}, 'FetchEvent.handled should reject when the promise provided' +
+    ' to respondWith() is resolved to an invalid response');
+
+promise_test(async (t) => {
+  frame.contentWindow.fetch(
+      'dummy.txt?respondWith-called-and-promise-rejected').catch((e) => {});
+  const message = await wait_for_message_from_worker();
+  assert_equals(message, 'REJECTED');
+}, 'FetchEvent.handled should reject when the promise provided to' +
+    ' respondWith() is rejected');
+
+// Global cleanup: the final promise_test.
+promise_test(async (t) => {
+  if (frame)
+    frame.remove();
+  await service_worker_unregister(t, scope);
+}, 'global cleanup');
+</script>
+</html>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/multipart-image.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/multipart-image.https.html
index 98336d7d9e2..00c20d25f90 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/multipart-image.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/multipart-image.https.html
@@ -56,12 +56,13 @@ promise_test(t => {
 promise_test(t => {
     return frame.contentWindow.load_multipart_image('cross-origin-multipart-image-with-no-cors')
       .then(img => {
-        assert_throws_dom('SecurityError', () => frame.contentWindow.get_image_data(img));
+        assert_throws_dom('SecurityError', frame.contentWindow.DOMException,
+                          () => frame.contentWindow.get_image_data(img));
       });
   }, 'cross-origin multipart image with no-cors via SW should not be readable');
 
 promise_test(t => {
     const promise = frame.contentWindow.load_multipart_image('cross-origin-multipart-image-with-cors-rejected');
-    return promise_rejects_dom(t, 'NetworkError', promise);
+    return promise_rejects_dom(t, 'NetworkError', frame.contentWindow.DOMException, promise);
   }, 'cross-origin multipart image via SW with rejected CORS should fail to load');
 </script>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-handled-worker.js b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-handled-worker.js
new file mode 100644
index 00000000000..4af58e20d05
--- /dev/null
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-handled-worker.js
@@ -0,0 +1,41 @@
+// This worker reports back the final state of FetchEvent.handled (RESOLVED or
+// REJECTED) to the test.
+
+// Send a message to the client with the client id.
+function send_message_to_client(message, clientId) {
+  clients.get(clientId).then((client) => {
+    client.postMessage(message);
+  });
+}
+
+self.addEventListener('fetch', function(event) {
+  const clientId = event.clientId;
+  try {
+    event.handled.then(() => {
+      send_message_to_client('RESOLVED', clientId);
+    }, () => {
+      send_message_to_client('REJECTED', clientId);
+    });
+  } catch (e) {
+    send_message_to_client('FAILED', clientId);
+    return;
+  }
+
+  const search = new URL(event.request.url).search;
+  switch (search) {
+    case '?respondWith-not-called':
+      break;
+    case '?respondWith-not-called-and-event-canceled':
+      event.preventDefault();
+      break;
+    case '?respondWith-called-and-promise-resolved':
+      event.respondWith(Promise.resolve(new Response('body')));
+      break;
+    case '?respondWith-called-and-promise-resolved-to-invalid-response':
+      event.respondWith(Promise.resolve('invalid response'));
+      break;
+    case '?respondWith-called-and-promise-rejected':
+      event.respondWith(Promise.reject(new Error('respondWith rejected')));
+      break;
+  }
+});
diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/LICENSE b/tests/wpt/web-platform-tests/shadow-dom/untriaged/LICENSE
deleted file mode 100644
index 531fac43af2..00000000000
--- a/tests/wpt/web-platform-tests/shadow-dom/untriaged/LICENSE
+++ /dev/null
@@ -1,107 +0,0 @@
-Copyright 2012, Google Inc.
-All rights reserved.
-
-Licensed under the W3C Test Suite License (the "License"); you may not
-use this software except in compliance with the License. You may
-obtain a copy of the License at
-
-    http://www.w3.org/Consortium/Legal/2008/04-testsuite-license.html
-
-Alternatively, this software may be distributed under the terms of the
-W3C 3-clause BSD License. You may obtain a copy of the W3C 3-clause
-BSD License at
-
-    http://www.w3.org/Consortium/Legal/2008/03-bsd-license.html
-
-
-W3C Test Suite Licence
-
-This document, Test Suites and other documents that link to this
-statement are provided by the copyright holders under the following
-license: By using and/or copying this document, or the W3C document
-from which this statement is linked, you (the licensee) agree that you
-have read, understood, and will comply with the following terms and
-conditions:
-
-Permission to copy, and distribute the contents of this document, or
-the W3C document from which this statement is linked, in any medium
-for any purpose and without fee or royalty is hereby granted, provided
-that you include the following on ALL copies of the document, or
-portions thereof, that you use:
-
-   1. A link or URL to the original W3C document.
-   2. The pre-existing copyright notice of the original author, or if
-it doesn't exist, a notice (hypertext is preferred, but a textual
-representation is permitted) of the form: "Copyright ©
-[$date-of-document] World Wide Web Consortium, (Massachusetts
-Institute of Technology, European Research Consortium for Informatics
-and Mathematics, Keio University) and others. All Rights
-Reserved. http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html"
-   3. If it exists, the STATUS of the W3C document.  When space
-permits, inclusion of the full text of this NOTICE should be
-provided. We request that authorship attribution be provided in any
-software, documents, or other items or products that you create
-pursuant to the implementation of the contents of this document, or
-any portion thereof.
-
-No right to create modifications or derivatives of W3C documents is
-granted pursuant to this license. However, if additional requirements
-(documented in the Copyright FAQ) are satisfied, the right to create
-modifications or derivatives is sometimes granted by the W3C to
-individuals complying with those requirements.
-
-If a Test Suite distinguishes the test harness (or, framework for
-navigation) and the actual tests, permission is given to remove or
-alter the harness or navigation if the Test Suite in question allows
-to do so. The tests themselves shall NOT be changed in any way.
-
-The name and trademarks of W3C and other copyright holders may NOT be
-used in advertising or publicity pertaining to this document or other
-documents that link to this statement without specific, written prior
-permission. Title to copyright in this document will at all times
-remain with copyright holders. Permission is given to use the
-trademarked string W3C within claims of performance concerning W3C
-Specifications or features described therein, and there only, if the
-test suite so authorizes.
-
-THIS WORK IS PROVIDED BY W3C, MIT, ERCIM, KEIO UNIVERSITY, THE
-COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL W3C, MIT, ERCIM, KEIO UNIVERSITY, THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-
-W3C 3-clause BSD License
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-   * Redistributions of works must retain the original copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the original
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of the W3C nor the names of its contributors may
-be used to endorse or promote products derived from this work without
-specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/tests/wpt/web-platform-tests/tools/localpaths.py b/tests/wpt/web-platform-tests/tools/localpaths.py
index f6e24b486d5..ce3b41e300c 100644
--- a/tests/wpt/web-platform-tests/tools/localpaths.py
+++ b/tests/wpt/web-platform-tests/tools/localpaths.py
@@ -6,7 +6,7 @@ repo_root = os.path.abspath(os.path.join(here, os.pardir))
 
 sys.path.insert(0, os.path.join(here))
 sys.path.insert(0, os.path.join(here, "wptserve"))
-sys.path.insert(0, os.path.join(here, "pywebsocket"))
+sys.path.insert(0, os.path.join(here, "third_party", "pywebsocket3"))
 sys.path.insert(0, os.path.join(here, "third_party", "atomicwrites"))
 sys.path.insert(0, os.path.join(here, "third_party", "attrs", "src"))
 sys.path.insert(0, os.path.join(here, "third_party", "funcsigs"))
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/CONTRIBUTING b/tests/wpt/web-platform-tests/tools/pywebsocket/CONTRIBUTING
deleted file mode 100644
index 6415f5d011f..00000000000
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/CONTRIBUTING
+++ /dev/null
@@ -1,11 +0,0 @@
-For instructions for contributing code, please read:
-https://github.com/google/pywebsocket/wiki/CodeReviewInstruction
-
-You must complete the Individual Contributor License Agreement.
-https://cla.developers.google.com/about/google-individual
-You can do this online, and it only takes a minute.
-
-If you are contributing on behalf of a corporation, you must fill out the
-Corporate Contributor License Agreement
-https://cla.developers.google.com/about/google-corporate
-and send it to us as described on that page.
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/README b/tests/wpt/web-platform-tests/tools/pywebsocket/README
deleted file mode 100644
index c8c758f5eef..00000000000
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/README
+++ /dev/null
@@ -1,17 +0,0 @@
-INSTALL
-
-To install this package to the system, run this:
-$ python setup.py build
-$ sudo python setup.py install
-
-To install this package as a normal user, run this instead:
-$ python setup.py build
-$ python setup.py install --user
-
-LAUNCH
-
-To use pywebsocket as Apache module, run this to read the document:
-$ pydoc mod_pywebsocket
-
-To use pywebsocket as standalone server, run this to read the document:
-$ pydoc mod_pywebsocket.standalone
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/README.md b/tests/wpt/web-platform-tests/tools/pywebsocket/README.md
deleted file mode 100644
index ae8e910a84e..00000000000
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-
-# pywebsocket #
-
-The pywebsocket project aims to provide a [WebSocket](https://tools.ietf.org/html/rfc6455) standalone server and a WebSocket extension for [Apache HTTP Server](https://httpd.apache.org/), mod\_pywebsocket.
-
-pywebsocket is intended for **testing** or **experimental** purposes.
-
-Please see [Wiki](../../wiki) for more details.
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/example/cookie_wsh.py b/tests/wpt/web-platform-tests/tools/pywebsocket/example/cookie_wsh.py
deleted file mode 100644
index 8b327152e70..00000000000
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/example/cookie_wsh.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2014 Google Inc. All rights reserved.
-#
-# Use of this source code is governed by a BSD-style
-# license that can be found in the COPYING file or at
-# https://developers.google.com/open-source/licenses/bsd
-
-
-import urlparse
-
-
-def _add_set_cookie(request, value):
-    request.extra_headers.append(('Set-Cookie', value))
-
-
-def web_socket_do_extra_handshake(request):
-    components = urlparse.urlparse(request.uri)
-    command = components[4]
-
-    ONE_DAY_LIFE = 'Max-Age=86400'
-
-    if command == 'set':
-        _add_set_cookie(request, '; '.join(['foo=bar', ONE_DAY_LIFE]))
-    elif command == 'set_httponly':
-        _add_set_cookie(request,
-            '; '.join(['httpOnlyFoo=bar', ONE_DAY_LIFE, 'httpOnly']))
-    elif command == 'clear':
-        _add_set_cookie(request, 'foo=0; Max-Age=0')
-        _add_set_cookie(request, 'httpOnlyFoo=0; Max-Age=0')
-
-
-def web_socket_transfer_data(request):
-    pass
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/example/echo_client.py b/tests/wpt/web-platform-tests/tools/pywebsocket/example/echo_client.py
deleted file mode 100755
index 8ac740e7058..00000000000
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/example/echo_client.py
+++ /dev/null
@@ -1,1129 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2011, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-"""Simple WebSocket client named echo_client just because of historical reason.
-
-mod_pywebsocket directory must be in PYTHONPATH.
-
-Example Usage:
-
-# server setup
- % cd $pywebsocket
- % PYTHONPATH=$cwd/src python ./mod_pywebsocket/standalone.py -p 8880 \
-    -d $cwd/src/example
-
-# run client
- % PYTHONPATH=$cwd/src python ./src/example/echo_client.py -p 8880 \
-     -s localhost \
-     -o http://localhost -r /echo -m test
-
-or
-
-# run echo client to test IETF HyBi 00 protocol
- run with --protocol-version=hybi00
-"""
-from __future__ import print_function
-
-
-import base64
-import codecs
-import logging
-from optparse import OptionParser
-import os
-import random
-import re
-import socket
-import struct
-import sys
-
-from mod_pywebsocket import common
-from mod_pywebsocket.extensions import DeflateFrameExtensionProcessor
-from mod_pywebsocket.extensions import PerMessageDeflateExtensionProcessor
-from mod_pywebsocket.extensions import _PerMessageDeflateFramer
-from mod_pywebsocket.extensions import _parse_window_bits
-from mod_pywebsocket.stream import Stream
-from mod_pywebsocket.stream import StreamHixie75
-from mod_pywebsocket.stream import StreamOptions
-from mod_pywebsocket import util
-
-
-_TIMEOUT_SEC = 10
-_UNDEFINED_PORT = -1
-
-_UPGRADE_HEADER = 'Upgrade: websocket\r\n'
-_UPGRADE_HEADER_HIXIE75 = 'Upgrade: WebSocket\r\n'
-_CONNECTION_HEADER = 'Connection: Upgrade\r\n'
-
-# Special message that tells the echo server to start closing handshake
-_GOODBYE_MESSAGE = 'Goodbye'
-
-_PROTOCOL_VERSION_HYBI13 = 'hybi13'
-_PROTOCOL_VERSION_HYBI08 = 'hybi08'
-_PROTOCOL_VERSION_HYBI00 = 'hybi00'
-_PROTOCOL_VERSION_HIXIE75 = 'hixie75'
-
-# Constants for the --tls_module flag.
-_TLS_BY_STANDARD_MODULE = 'ssl'
-_TLS_BY_PYOPENSSL = 'pyopenssl'
-
-# Values used by the --tls-version flag.
-_TLS_VERSION_SSL23 = 'ssl23'
-_TLS_VERSION_SSL3 = 'ssl3'
-_TLS_VERSION_TLS1 = 'tls1'
-
-
-class ClientHandshakeError(Exception):
-    pass
-
-
-def _build_method_line(resource):
-    return 'GET %s HTTP/1.1\r\n' % resource
-
-
-def _origin_header(header, origin):
-    # 4.1 13. concatenation of the string "Origin:", a U+0020 SPACE character,
-    # and the /origin/ value, converted to ASCII lowercase, to /fields/.
-    return '%s: %s\r\n' % (header, origin.lower())
-
-
-def _format_host_header(host, port, secure):
-    # 4.1 9. Let /hostport/ be an empty string.
-    # 4.1 10. Append the /host/ value, converted to ASCII lowercase, to
-    # /hostport/
-    hostport = host.lower()
-    # 4.1 11. If /secure/ is false, and /port/ is not 80, or if /secure/
-    # is true, and /port/ is not 443, then append a U+003A COLON character
-    # (:) followed by the value of /port/, expressed as a base-ten integer,
-    # to /hostport/
-    if ((not secure and port != common.DEFAULT_WEB_SOCKET_PORT) or
-        (secure and port != common.DEFAULT_WEB_SOCKET_SECURE_PORT)):
-        hostport += ':' + str(port)
-    # 4.1 12. concatenation of the string "Host:", a U+0020 SPACE
-    # character, and /hostport/, to /fields/.
-    return '%s: %s\r\n' % (common.HOST_HEADER, hostport)
-
-
-def _receive_bytes(socket, length):
-    bytes = []
-    remaining = length
-    while remaining > 0:
-        received_bytes = socket.recv(remaining)
-        if not received_bytes:
-            raise IOError(
-                'Connection closed before receiving requested length '
-                '(requested %d bytes but received only %d bytes)' %
-                (length, length - remaining))
-        bytes.append(received_bytes)
-        remaining -= len(received_bytes)
-    return ''.join(bytes)
-
-
-def _get_mandatory_header(fields, name):
-    """Gets the value of the header specified by name from fields.
-
-    This function expects that there's only one header with the specified name
-    in fields. Otherwise, raises an ClientHandshakeError.
-    """
-
-    values = fields.get(name.lower())
-    if values is None or len(values) == 0:
-        raise ClientHandshakeError(
-            '%s header not found: %r' % (name, values))
-    if len(values) > 1:
-        raise ClientHandshakeError(
-            'Multiple %s headers found: %r' % (name, values))
-    return values[0]
-
-
-def _validate_mandatory_header(fields, name,
-                               expected_value, case_sensitive=False):
-    """Gets and validates the value of the header specified by name from
-    fields.
-
-    If expected_value is specified, compares expected value and actual value
-    and raises an ClientHandshakeError on failure. You can specify case
-    sensitiveness in this comparison by case_sensitive parameter. This function
-    expects that there's only one header with the specified name in fields.
-    Otherwise, raises an ClientHandshakeError.
-    """
-
-    value = _get_mandatory_header(fields, name)
-
-    if ((case_sensitive and value != expected_value) or
-        (not case_sensitive and value.lower() != expected_value.lower())):
-        raise ClientHandshakeError(
-            'Illegal value for header %s: %r (expected) vs %r (actual)' %
-            (name, expected_value, value))
-
-
-class _TLSSocket(object):
-    """Wrapper for a TLS connection."""
-
-    def __init__(self,
-                 raw_socket, tls_module, tls_version, disable_tls_compression):
-        self._logger = util.get_class_logger(self)
-
-        if tls_module == _TLS_BY_STANDARD_MODULE:
-            if tls_version == _TLS_VERSION_SSL23:
-                version = ssl.PROTOCOL_SSLv23
-            elif tls_version == _TLS_VERSION_SSL3:
-                version = ssl.PROTOCOL_SSLv3
-            elif tls_version == _TLS_VERSION_TLS1:
-                version = ssl.PROTOCOL_TLSv1
-            else:
-                raise ValueError(
-                    'Invalid --tls-version flag: %r' % tls_version)
-
-            if disable_tls_compression:
-                raise ValueError(
-                    '--disable-tls-compression is not available for ssl '
-                    'module')
-
-            self._tls_socket = ssl.wrap_socket(raw_socket, ssl_version=version)
-
-            # Print cipher in use. Handshake is done on wrap_socket call.
-            self._logger.info("Cipher: %s", self._tls_socket.cipher())
-        elif tls_module == _TLS_BY_PYOPENSSL:
-            if tls_version == _TLS_VERSION_SSL23:
-                version = OpenSSL.SSL.SSLv23_METHOD
-            elif tls_version == _TLS_VERSION_SSL3:
-                version = OpenSSL.SSL.SSLv3_METHOD
-            elif tls_version == _TLS_VERSION_TLS1:
-                version = OpenSSL.SSL.TLSv1_METHOD
-            else:
-                raise ValueError(
-                    'Invalid --tls-version flag: %r' % tls_version)
-
-            context = OpenSSL.SSL.Context(version)
-
-            if disable_tls_compression:
-                # OP_NO_COMPRESSION is not defined in OpenSSL module.
-                context.set_options(0x00020000)
-
-            self._tls_socket = OpenSSL.SSL.Connection(context, raw_socket)
-            # Client mode.
-            self._tls_socket.set_connect_state()
-            self._tls_socket.setblocking(True)
-
-            # Do handshake now (not necessary).
-            self._tls_socket.do_handshake()
-        else:
-            raise ValueError('No TLS support module is available')
-
-    def send(self, data):
-        return self._tls_socket.write(data)
-
-    def sendall(self, data):
-        return self._tls_socket.sendall(data)
-
-    def recv(self, size=-1):
-        return self._tls_socket.read(size)
-
-    def close(self):
-        return self._tls_socket.close()
-
-    def getpeername(self):
-        return self._tls_socket.getpeername()
-
-
-class ClientHandshakeBase(object):
-    """A base class for WebSocket opening handshake processors for each
-    protocol version.
-    """
-
-    def __init__(self):
-        self._logger = util.get_class_logger(self)
-
-    def _read_fields(self):
-        # 4.1 32. let /fields/ be a list of name-value pairs, initially empty.
-        fields = {}
-        while True:  # "Field"
-            # 4.1 33. let /name/ and /value/ be empty byte arrays
-            name = ''
-            value = ''
-            # 4.1 34. read /name/
-            name = self._read_name()
-            if name is None:
-                break
-            # 4.1 35. read spaces
-            # TODO(tyoshino): Skip only one space as described in the spec.
-            ch = self._skip_spaces()
-            # 4.1 36. read /value/
-            value = self._read_value(ch)
-            # 4.1 37. read a byte from the server
-            ch = _receive_bytes(self._socket, 1)
-            if ch != '\n':  # 0x0A
-                raise ClientHandshakeError(
-                    'Expected LF but found %r while reading value %r for '
-                    'header %r' % (ch, value, name))
-            self._logger.debug('Received %r header', name)
-            # 4.1 38. append an entry to the /fields/ list that has the name
-            # given by the string obtained by interpreting the /name/ byte
-            # array as a UTF-8 stream and the value given by the string
-            # obtained by interpreting the /value/ byte array as a UTF-8 byte
-            # stream.
-            fields.setdefault(name, []).append(value)
-            # 4.1 39. return to the "Field" step above
-        return fields
-
-    def _read_name(self):
-        # 4.1 33. let /name/ be empty byte arrays
-        name = ''
-        while True:
-            # 4.1 34. read a byte from the server
-            ch = _receive_bytes(self._socket, 1)
-            if ch == '\r':  # 0x0D
-                return None
-            elif ch == '\n':  # 0x0A
-                raise ClientHandshakeError(
-                    'Unexpected LF when reading header name %r' % name)
-            elif ch == ':':  # 0x3A
-                return name
-            elif ch >= 'A' and ch <= 'Z':  # Range 0x31 to 0x5A
-                ch = chr(ord(ch) + 0x20)
-                name += ch
-            else:
-                name += ch
-
-    def _skip_spaces(self):
-        # 4.1 35. read a byte from the server
-        while True:
-            ch = _receive_bytes(self._socket, 1)
-            if ch == ' ':  # 0x20
-                continue
-            return ch
-
-    def _read_value(self, ch):
-        # 4.1 33. let /value/ be empty byte arrays
-        value = ''
-        # 4.1 36. read a byte from server.
-        while True:
-            if ch == '\r':  # 0x0D
-                return value
-            elif ch == '\n':  # 0x0A
-                raise ClientHandshakeError(
-                    'Unexpected LF when reading header value %r' % value)
-            else:
-                value += ch
-            ch = _receive_bytes(self._socket, 1)
-
-
-def _get_permessage_deflate_framer(extension_response):
-    """Validate the response and return a framer object using the parameters in
-    the response. This method doesn't accept the server_.* parameters.
-    """
-
-    client_max_window_bits = None
-    client_no_context_takeover = None
-
-    client_max_window_bits_name = (
-            PerMessageDeflateExtensionProcessor.
-                    _CLIENT_MAX_WINDOW_BITS_PARAM)
-    client_no_context_takeover_name = (
-            PerMessageDeflateExtensionProcessor.
-                    _CLIENT_NO_CONTEXT_TAKEOVER_PARAM)
-
-    # We didn't send any server_.* parameter.
-    # Handle those parameters as invalid if found in the response.
-
-    for param_name, param_value in extension_response.get_parameters():
-        if param_name == client_max_window_bits_name:
-            if client_max_window_bits is not None:
-                raise ClientHandshakeError(
-                        'Multiple %s found' % client_max_window_bits_name)
-
-            parsed_value = _parse_window_bits(param_value)
-            if parsed_value is None:
-                raise ClientHandshakeError(
-                        'Bad %s: %r' %
-                        (client_max_window_bits_name, param_value))
-            client_max_window_bits = parsed_value
-        elif param_name == client_no_context_takeover_name:
-            if client_no_context_takeover is not None:
-                raise ClientHandshakeError(
-                        'Multiple %s found' % client_no_context_takeover_name)
-
-            if param_value is not None:
-                raise ClientHandshakeError(
-                        'Bad %s: Has value %r' %
-                        (client_no_context_takeover_name, param_value))
-            client_no_context_takeover = True
-
-    if client_no_context_takeover is None:
-        client_no_context_takeover = False
-
-    return _PerMessageDeflateFramer(client_max_window_bits,
-                                    client_no_context_takeover)
-
-
-class ClientHandshakeProcessor(ClientHandshakeBase):
-    """WebSocket opening handshake processor for
-    draft-ietf-hybi-thewebsocketprotocol-06 and later.
-    """
-
-    def __init__(self, socket, options):
-        super(ClientHandshakeProcessor, self).__init__()
-
-        self._socket = socket
-        self._options = options
-
-        self._logger = util.get_class_logger(self)
-
-    def handshake(self):
-        """Performs opening handshake on the specified socket.
-
-        Raises:
-            ClientHandshakeError: handshake failed.
-        """
-
-        request_line = _build_method_line(self._options.resource)
-        self._logger.debug('Client\'s opening handshake Request-Line: %r',
-                           request_line)
-        self._socket.sendall(request_line)
-
-        fields = []
-        fields.append(_format_host_header(
-            self._options.server_host,
-            self._options.server_port,
-            self._options.use_tls))
-        fields.append(_UPGRADE_HEADER)
-        fields.append(_CONNECTION_HEADER)
-        if self._options.origin is not None:
-            if self._options.protocol_version == _PROTOCOL_VERSION_HYBI08:
-                fields.append(_origin_header(
-                    common.SEC_WEBSOCKET_ORIGIN_HEADER,
-                    self._options.origin))
-            else:
-                fields.append(_origin_header(common.ORIGIN_HEADER,
-                                             self._options.origin))
-
-        original_key = os.urandom(16)
-        self._key = base64.b64encode(original_key)
-        self._logger.debug(
-            '%s: %r (%s)',
-            common.SEC_WEBSOCKET_KEY_HEADER,
-            self._key,
-            util.hexify(original_key))
-        fields.append(
-            '%s: %s\r\n' % (common.SEC_WEBSOCKET_KEY_HEADER, self._key))
-
-        if self._options.version_header > 0:
-            fields.append('%s: %d\r\n' % (common.SEC_WEBSOCKET_VERSION_HEADER,
-                                          self._options.version_header))
-        elif self._options.protocol_version == _PROTOCOL_VERSION_HYBI08:
-            fields.append('%s: %d\r\n' % (common.SEC_WEBSOCKET_VERSION_HEADER,
-                                          common.VERSION_HYBI08))
-        else:
-            fields.append('%s: %d\r\n' % (common.SEC_WEBSOCKET_VERSION_HEADER,
-                                          common.VERSION_HYBI_LATEST))
-
-        extensions_to_request = []
-
-        if self._options.deflate_frame:
-            extensions_to_request.append(
-                common.ExtensionParameter(common.DEFLATE_FRAME_EXTENSION))
-
-        if self._options.use_permessage_deflate:
-            extension = common.ExtensionParameter(
-                    common.PERMESSAGE_DEFLATE_EXTENSION)
-            # Accept the client_max_window_bits extension parameter by default.
-            extension.add_parameter(
-                    PerMessageDeflateExtensionProcessor.
-                            _CLIENT_MAX_WINDOW_BITS_PARAM,
-                    None)
-            extensions_to_request.append(extension)
-
-        if len(extensions_to_request) != 0:
-            fields.append(
-                '%s: %s\r\n' %
-                (common.SEC_WEBSOCKET_EXTENSIONS_HEADER,
-                 common.format_extensions(extensions_to_request)))
-
-        for field in fields:
-            self._socket.sendall(field)
-
-        self._socket.sendall('\r\n')
-
-        self._logger.debug('Sent client\'s opening handshake headers: %r',
-                           fields)
-        self._logger.debug('Start reading Status-Line')
-
-        status_line = ''
-        while True:
-            ch = _receive_bytes(self._socket, 1)
-            status_line += ch
-            if ch == '\n':
-                break
-
-        m = re.match('HTTP/\\d+\\.\\d+ (\\d\\d\\d) .*\r\n', status_line)
-        if m is None:
-            raise ClientHandshakeError(
-                'Wrong status line format: %r' % status_line)
-        status_code = m.group(1)
-        if status_code != '101':
-            self._logger.debug('Unexpected status code %s with following '
-                               'headers: %r', status_code, self._read_fields())
-            raise ClientHandshakeError(
-                'Expected HTTP status code 101 but found %r' % status_code)
-
-        self._logger.debug('Received valid Status-Line')
-        self._logger.debug('Start reading headers until we see an empty line')
-
-        fields = self._read_fields()
-
-        ch = _receive_bytes(self._socket, 1)
-        if ch != '\n':  # 0x0A
-            raise ClientHandshakeError(
-                'Expected LF but found %r while reading value %r for header '
-                'name %r' % (ch, value, name))
-
-        self._logger.debug('Received an empty line')
-        self._logger.debug('Server\'s opening handshake headers: %r', fields)
-
-        _validate_mandatory_header(
-            fields,
-            common.UPGRADE_HEADER,
-            common.WEBSOCKET_UPGRADE_TYPE,
-            False)
-
-        _validate_mandatory_header(
-            fields,
-            common.CONNECTION_HEADER,
-            common.UPGRADE_CONNECTION_TYPE,
-            False)
-
-        accept = _get_mandatory_header(
-            fields, common.SEC_WEBSOCKET_ACCEPT_HEADER)
-
-        # Validate
-        try:
-            binary_accept = base64.b64decode(accept)
-        except TypeError:
-            raise HandshakeError(
-                'Illegal value for header %s: %r' %
-                (common.SEC_WEBSOCKET_ACCEPT_HEADER, accept))
-
-        if len(binary_accept) != 20:
-            raise ClientHandshakeError(
-                'Decoded value of %s is not 20-byte long' %
-                common.SEC_WEBSOCKET_ACCEPT_HEADER)
-
-        self._logger.debug(
-            'Response for challenge : %r (%s)',
-            accept, util.hexify(binary_accept))
-
-        binary_expected_accept = util.sha1_hash(
-            self._key + common.WEBSOCKET_ACCEPT_UUID).digest()
-        expected_accept = base64.b64encode(binary_expected_accept)
-
-        self._logger.debug(
-            'Expected response for challenge: %r (%s)',
-            expected_accept, util.hexify(binary_expected_accept))
-
-        if accept != expected_accept:
-            raise ClientHandshakeError(
-                'Invalid %s header: %r (expected: %s)' %
-                (common.SEC_WEBSOCKET_ACCEPT_HEADER, accept, expected_accept))
-
-        deflate_frame_accepted = False
-        permessage_deflate_accepted = False
-
-        extensions_header = fields.get(
-            common.SEC_WEBSOCKET_EXTENSIONS_HEADER.lower())
-        accepted_extensions = []
-        if extensions_header is not None and len(extensions_header) != 0:
-            accepted_extensions = common.parse_extensions(extensions_header[0])
-
-        # TODO(bashi): Support the new style perframe compression extension.
-        for extension in accepted_extensions:
-            extension_name = extension.name()
-            if (extension_name == common.DEFLATE_FRAME_EXTENSION and
-                self._options.deflate_frame):
-                deflate_frame_accepted = True
-                processor = DeflateFrameExtensionProcessor(extension)
-                unused_extension_response = processor.get_extension_response()
-                self._options.deflate_frame = processor
-                continue
-            elif (extension_name == common.PERMESSAGE_DEFLATE_EXTENSION and
-                  self._options.use_permessage_deflate):
-                permessage_deflate_accepted = True
-
-                framer = _get_permessage_deflate_framer(extension)
-                framer.set_compress_outgoing_enabled(True)
-                self._options.use_permessage_deflate = framer
-                continue
-
-            raise ClientHandshakeError(
-                'Unexpected extension %r' % extension_name)
-
-        if (self._options.deflate_frame and not deflate_frame_accepted):
-            raise ClientHandshakeError(
-                'Requested %s, but the server rejected it' %
-                common.DEFLATE_FRAME_EXTENSION)
-
-        if (self._options.use_permessage_deflate and
-            not permessage_deflate_accepted):
-            raise ClientHandshakeError(
-                    'Requested %s, but the server rejected it' %
-                    common.PERMESSAGE_DEFLATE_EXTENSION)
-
-        # TODO(tyoshino): Handle Sec-WebSocket-Protocol
-        # TODO(tyoshino): Handle Cookie, etc.
-
-
-class ClientHandshakeProcessorHybi00(ClientHandshakeBase):
-    """WebSocket opening handshake processor for
-    draft-ietf-hybi-thewebsocketprotocol-00 (equivalent to
-    draft-hixie-thewebsocketprotocol-76).
-    """
-
-    def __init__(self, socket, options):
-        super(ClientHandshakeProcessorHybi00, self).__init__()
-
-        self._socket = socket
-        self._options = options
-
-        self._logger = util.get_class_logger(self)
-
-        if (self._options.deflate_frame or
-            self._options.use_permessage_deflate):
-            logging.critical('HyBi 00 doesn\'t support extensions.')
-            sys.exit(1)
-
-    def handshake(self):
-        """Performs opening handshake on the specified socket.
-
-        Raises:
-            ClientHandshakeError: handshake failed.
-        """
-
-        # 4.1 5. send request line.
-        self._socket.sendall(_build_method_line(self._options.resource))
-        # 4.1 6. Let /fields/ be an empty list of strings.
-        fields = []
-        # 4.1 7. Add the string "Upgrade: WebSocket" to /fields/.
-        fields.append(_UPGRADE_HEADER_HIXIE75)
-        # 4.1 8. Add the string "Connection: Upgrade" to /fields/.
-        fields.append(_CONNECTION_HEADER)
-        # 4.1 9-12. Add Host: field to /fields/.
-        fields.append(_format_host_header(
-            self._options.server_host,
-            self._options.server_port,
-            self._options.use_tls))
-        # 4.1 13. Add Origin: field to /fields/.
-        if not self._options.origin:
-            raise ClientHandshakeError(
-                'Specify the origin of the connection by --origin flag')
-        fields.append(_origin_header(common.ORIGIN_HEADER,
-                                     self._options.origin))
-        # TODO: 4.1 14 Add Sec-WebSocket-Protocol: field to /fields/.
-        # TODO: 4.1 15 Add cookie headers to /fields/.
-
-        # 4.1 16-23. Add Sec-WebSocket-Key<n> to /fields/.
-        self._number1, key1 = self._generate_sec_websocket_key()
-        self._logger.debug('Number1: %d', self._number1)
-        fields.append('%s: %s\r\n' % (common.SEC_WEBSOCKET_KEY1_HEADER, key1))
-        self._number2, key2 = self._generate_sec_websocket_key()
-        self._logger.debug('Number2: %d', self._number2)
-        fields.append('%s: %s\r\n' % (common.SEC_WEBSOCKET_KEY2_HEADER, key2))
-
-        fields.append('%s: 0\r\n' % common.SEC_WEBSOCKET_DRAFT_HEADER)
-
-        # 4.1 24. For each string in /fields/, in a random order: send the
-        # string, encoded as UTF-8, followed by a UTF-8 encoded U+000D CARRIAGE
-        # RETURN U+000A LINE FEED character pair (CRLF).
-        random.shuffle(fields)
-        for field in fields:
-            self._socket.sendall(field)
-        # 4.1 25. send a UTF-8-encoded U+000D CARRIAGE RETURN U+000A LINE FEED
-        # character pair (CRLF).
-        self._socket.sendall('\r\n')
-        # 4.1 26. let /key3/ be a string consisting of eight random bytes (or
-        # equivalently, a random 64 bit integer encoded in a big-endian order).
-        self._key3 = self._generate_key3()
-        # 4.1 27. send /key3/ to the server.
-        self._socket.sendall(self._key3)
-        self._logger.debug(
-            'Key3: %r (%s)', self._key3, util.hexify(self._key3))
-
-        self._logger.info('Sent handshake')
-
-        # 4.1 28. Read bytes from the server until either the connection
-        # closes, or a 0x0A byte is read. let /field/ be these bytes, including
-        # the 0x0A bytes.
-        field = ''
-        while True:
-            ch = _receive_bytes(self._socket, 1)
-            field += ch
-            if ch == '\n':
-                break
-        # if /field/ is not at least seven bytes long, or if the last
-        # two bytes aren't 0x0D and 0x0A respectively, or if it does not
-        # contain at least two 0x20 bytes, then fail the WebSocket connection
-        # and abort these steps.
-        if len(field) < 7 or not field.endswith('\r\n'):
-            raise ClientHandshakeError('Wrong status line: %r' % field)
-        m = re.match('[^ ]* ([^ ]*) .*', field)
-        if m is None:
-            raise ClientHandshakeError(
-                'No HTTP status code found in status line: %r' % field)
-        # 4.1 29. let /code/ be the substring of /field/ that starts from the
-        # byte after the first 0x20 byte, and ends with the byte before the
-        # second 0x20 byte.
-        code = m.group(1)
-        # 4.1 30. if /code/ is not three bytes long, or if any of the bytes in
-        # /code/ are not in the range 0x30 to 0x90, then fail the WebSocket
-        # connection and abort these steps.
-        if not re.match('[0-9][0-9][0-9]', code):
-            raise ClientHandshakeError(
-                'HTTP status code %r is not three digit in status line: %r' %
-                (code, field))
-        # 4.1 31. if /code/, interpreted as UTF-8, is "101", then move to the
-        # next step.
-        if code != '101':
-            raise ClientHandshakeError(
-                'Expected HTTP status code 101 but found %r in status line: '
-                '%r' % (code, field))
-        # 4.1 32-39. read fields into /fields/
-        fields = self._read_fields()
-        # 4.1 40. _Fields processing_
-        # read a byte from server
-        ch = _receive_bytes(self._socket, 1)
-        if ch != '\n':  # 0x0A
-            raise ClientHandshakeError('Expected LF but found %r' % ch)
-        # 4.1 41. check /fields/
-        # TODO(ukai): protocol
-        # if the entry's name is "upgrade"
-        #  if the value is not exactly equal to the string "WebSocket",
-        #  then fail the WebSocket connection and abort these steps.
-        _validate_mandatory_header(
-            fields,
-            common.UPGRADE_HEADER,
-            common.WEBSOCKET_UPGRADE_TYPE_HIXIE75,
-            True)
-        # if the entry's name is "connection"
-        #  if the value, converted to ASCII lowercase, is not exactly equal
-        #  to the string "upgrade", then fail the WebSocket connection and
-        #  abort these steps.
-        _validate_mandatory_header(
-            fields,
-            common.CONNECTION_HEADER,
-            common.UPGRADE_CONNECTION_TYPE,
-            False)
-
-        origin = _get_mandatory_header(
-            fields, common.SEC_WEBSOCKET_ORIGIN_HEADER)
-
-        location = _get_mandatory_header(
-            fields, common.SEC_WEBSOCKET_LOCATION_HEADER)
-
-        # TODO(ukai): check origin, location, cookie, ..
-
-        # 4.1 42. let /challenge/ be the concatenation of /number_1/,
-        # expressed as a big endian 32 bit integer, /number_2/, expressed
-        # as big endian 32 bit integer, and the eight bytes of /key_3/ in the
-        # order they were sent on the wire.
-        challenge = struct.pack('!I', self._number1)
-        challenge += struct.pack('!I', self._number2)
-        challenge += self._key3
-
-        self._logger.debug(
-            'Challenge: %r (%s)', challenge, util.hexify(challenge))
-
-        # 4.1 43. let /expected/ be the MD5 fingerprint of /challenge/ as a
-        # big-endian 128 bit string.
-        expected = util.md5_hash(challenge).digest()
-        self._logger.debug(
-            'Expected challenge response: %r (%s)',
-            expected, util.hexify(expected))
-
-        # 4.1 44. read sixteen bytes from the server.
-        # let /reply/ be those bytes.
-        reply = _receive_bytes(self._socket, 16)
-        self._logger.debug(
-            'Actual challenge response: %r (%s)', reply, util.hexify(reply))
-
-        # 4.1 45. if /reply/ does not exactly equal /expected/, then fail
-        # the WebSocket connection and abort these steps.
-        if expected != reply:
-            raise ClientHandshakeError(
-                'Bad challenge response: %r (expected) != %r (actual)' %
-                (expected, reply))
-        # 4.1 46. The *WebSocket connection is established*.
-
-    def _generate_sec_websocket_key(self):
-        # 4.1 16. let /spaces_n/ be a random integer from 1 to 12 inclusive.
-        spaces = random.randint(1, 12)
-        # 4.1 17. let /max_n/ be the largest integer not greater than
-        #  4,294,967,295 divided by /spaces_n/.
-        maxnum = 4294967295 / spaces
-        # 4.1 18. let /number_n/ be a random integer from 0 to /max_n/
-        # inclusive.
-        number = random.randint(0, maxnum)
-        # 4.1 19. let /product_n/ be the result of multiplying /number_n/ and
-        # /spaces_n/ together.
-        product = number * spaces
-        # 4.1 20. let /key_n/ be a string consisting of /product_n/, expressed
-        # in base ten using the numerals in the range U+0030 DIGIT ZERO (0) to
-        # U+0039 DIGIT NINE (9).
-        key = str(product)
-        # 4.1 21. insert between one and twelve random characters from the
-        # range U+0021 to U+002F and U+003A to U+007E into /key_n/ at random
-        # positions.
-        available_chars = range(0x21, 0x2f + 1) + range(0x3a, 0x7e + 1)
-        n = random.randint(1, 12)
-        for _ in xrange(n):
-            ch = random.choice(available_chars)
-            pos = random.randint(0, len(key))
-            key = key[0:pos] + chr(ch) + key[pos:]
-        # 4.1 22. insert /spaces_n/ U+0020 SPACE characters into /key_n/ at
-        # random positions other than start or end of the string.
-        for _ in xrange(spaces):
-            pos = random.randint(1, len(key) - 1)
-            key = key[0:pos] + ' ' + key[pos:]
-        return number, key
-
-    def _generate_key3(self):
-        # 4.1 26. let /key3/ be a string consisting of eight random bytes (or
-        # equivalently, a random 64 bit integer encoded in a big-endian order).
-        return ''.join([chr(random.randint(0, 255)) for _ in xrange(8)])
-
-
-class ClientConnection(object):
-    """A wrapper for socket object to provide the mp_conn interface.
-    mod_pywebsocket library is designed to be working on Apache mod_python's
-    mp_conn object.
-    """
-
-    def __init__(self, socket):
-        self._socket = socket
-
-    def write(self, data):
-        self._socket.sendall(data)
-
-    def read(self, n):
-        return self._socket.recv(n)
-
-    def get_remote_addr(self):
-        return self._socket.getpeername()
-    remote_addr = property(get_remote_addr)
-
-
-class ClientRequest(object):
-    """A wrapper class just to make it able to pass a socket object to
-    functions that expect a mp_request object.
-    """
-
-    def __init__(self, socket):
-        self._logger = util.get_class_logger(self)
-
-        self._socket = socket
-        self.connection = ClientConnection(socket)
-
-
-def _import_ssl():
-    global ssl
-    try:
-        import ssl
-        return True
-    except ImportError:
-        return False
-
-
-def _import_pyopenssl():
-    global OpenSSL
-    try:
-        import OpenSSL.SSL
-        return True
-    except ImportError:
-        return False
-
-
-class EchoClient(object):
-    """WebSocket echo client."""
-
-    def __init__(self, options):
-        self._options = options
-        self._socket = None
-
-        self._logger = util.get_class_logger(self)
-
-    def run(self):
-        """Run the client.
-
-        Shake hands and then repeat sending message and receiving its echo.
-        """
-
-        self._socket = socket.socket()
-        self._socket.settimeout(self._options.socket_timeout)
-        try:
-            self._socket.connect((self._options.server_host,
-                                  self._options.server_port))
-            if self._options.use_tls:
-                self._socket = _TLSSocket(
-                    self._socket,
-                    self._options.tls_module,
-                    self._options.tls_version,
-                    self._options.disable_tls_compression)
-
-            version = self._options.protocol_version
-
-            if (version == _PROTOCOL_VERSION_HYBI08 or
-                version == _PROTOCOL_VERSION_HYBI13):
-                self._handshake = ClientHandshakeProcessor(
-                    self._socket, self._options)
-            elif version == _PROTOCOL_VERSION_HYBI00:
-                self._handshake = ClientHandshakeProcessorHybi00(
-                    self._socket, self._options)
-            else:
-                raise ValueError(
-                    'Invalid --protocol-version flag: %r' % version)
-
-            self._handshake.handshake()
-
-            self._logger.info('Connection established')
-
-            request = ClientRequest(self._socket)
-
-            version_map = {
-                _PROTOCOL_VERSION_HYBI08: common.VERSION_HYBI08,
-                _PROTOCOL_VERSION_HYBI13: common.VERSION_HYBI13,
-                _PROTOCOL_VERSION_HYBI00: common.VERSION_HYBI00}
-            request.ws_version = version_map[version]
-
-            if (version == _PROTOCOL_VERSION_HYBI08 or
-                version == _PROTOCOL_VERSION_HYBI13):
-                stream_option = StreamOptions()
-                stream_option.mask_send = True
-                stream_option.unmask_receive = False
-
-                if self._options.deflate_frame is not False:
-                    processor = self._options.deflate_frame
-                    processor.setup_stream_options(stream_option)
-
-                if self._options.use_permessage_deflate is not False:
-                    framer = self._options.use_permessage_deflate
-                    framer.setup_stream_options(stream_option)
-
-                self._stream = Stream(request, stream_option)
-            elif version == _PROTOCOL_VERSION_HYBI00:
-                self._stream = StreamHixie75(request, True)
-
-            for line in self._options.message.split(','):
-                self._stream.send_message(line)
-                if self._options.verbose:
-                    print('Send: %s' % line)
-                try:
-                    received = self._stream.receive_message()
-
-                    if self._options.verbose:
-                        print('Recv: %s' % received)
-                except Exception as e:
-                    if self._options.verbose:
-                        print('Error: %s' % e)
-                    raise
-
-            self._do_closing_handshake()
-        finally:
-            self._socket.close()
-
-    def _do_closing_handshake(self):
-        """Perform closing handshake using the specified closing frame."""
-
-        if self._options.message.split(',')[-1] == _GOODBYE_MESSAGE:
-            # requested server initiated closing handshake, so
-            # expecting closing handshake message from server.
-            self._logger.info('Wait for server-initiated closing handshake')
-            message = self._stream.receive_message()
-            if message is None:
-                print('Recv close')
-                print('Send ack')
-                self._logger.info(
-                    'Received closing handshake and sent ack')
-                return
-        print('Send close')
-        self._stream.close_connection()
-        self._logger.info('Sent closing handshake')
-        print('Recv ack')
-        self._logger.info('Received ack')
-
-
-def main():
-    sys.stdout = codecs.getwriter('utf-8')(sys.stdout)
-
-    parser = OptionParser()
-    # We accept --command_line_flag style flags which is the same as Google
-    # gflags in addition to common --command-line-flag style flags.
-    parser.add_option('-s', '--server-host', '--server_host',
-                      dest='server_host', type='string',
-                      default='localhost', help='server host')
-    parser.add_option('-p', '--server-port', '--server_port',
-                      dest='server_port', type='int',
-                      default=_UNDEFINED_PORT, help='server port')
-    parser.add_option('-o', '--origin', dest='origin', type='string',
-                      default=None, help='origin')
-    parser.add_option('-r', '--resource', dest='resource', type='string',
-                      default='/echo', help='resource path')
-    parser.add_option('-m', '--message', dest='message', type='string',
-                      help=('comma-separated messages to send. '
-                           '%s will force close the connection from server.' %
-                            _GOODBYE_MESSAGE))
-    parser.add_option('-q', '--quiet', dest='verbose', action='store_false',
-                      default=True, help='suppress messages')
-    parser.add_option('-t', '--tls', dest='use_tls', action='store_true',
-                      default=False, help='use TLS (wss://). By default, '
-                      'it looks for ssl and pyOpenSSL module and uses found '
-                      'one. Use --tls-module option to specify which module '
-                      'to use')
-    parser.add_option('--tls-module', '--tls_module', dest='tls_module',
-                      type='choice',
-                      choices=[_TLS_BY_STANDARD_MODULE, _TLS_BY_PYOPENSSL],
-                      help='Use ssl module if "%s" is specified. '
-                      'Use pyOpenSSL module if "%s" is specified' %
-                      (_TLS_BY_STANDARD_MODULE, _TLS_BY_PYOPENSSL))
-    parser.add_option('--tls-version', '--tls_version',
-                      dest='tls_version',
-                      type='string', default=_TLS_VERSION_SSL23,
-                      help='TLS/SSL version to use. One of \'' +
-                      _TLS_VERSION_SSL23 + '\' (SSL version 2 or 3), \'' +
-                      _TLS_VERSION_SSL3 + '\' (SSL version 3), \'' +
-                      _TLS_VERSION_TLS1 + '\' (TLS version 1)')
-    parser.add_option('--disable-tls-compression', '--disable_tls_compression',
-                      dest='disable_tls_compression',
-                      action='store_true', default=False,
-                      help='Disable TLS compression. Available only when '
-                      'pyOpenSSL module is used.')
-    parser.add_option('-k', '--socket-timeout', '--socket_timeout',
-                      dest='socket_timeout', type='int', default=_TIMEOUT_SEC,
-                      help='Timeout(sec) for sockets')
-    parser.add_option('--draft75', dest='draft75',
-                      action='store_true', default=False,
-                      help='Obsolete option. Don\'t use this.')
-    parser.add_option('--protocol-version', '--protocol_version',
-                      dest='protocol_version',
-                      type='string', default=_PROTOCOL_VERSION_HYBI13,
-                      help='WebSocket protocol version to use. One of \'' +
-                      _PROTOCOL_VERSION_HYBI13 + '\', \'' +
-                      _PROTOCOL_VERSION_HYBI08 + '\', \'' +
-                      _PROTOCOL_VERSION_HYBI00 + '\'')
-    parser.add_option('--version-header', '--version_header',
-                      dest='version_header',
-                      type='int', default=-1,
-                      help='Specify Sec-WebSocket-Version header value')
-    parser.add_option('--deflate-frame', '--deflate_frame',
-                      dest='deflate_frame',
-                      action='store_true', default=False,
-                      help='Use the deflate-frame extension.')
-    parser.add_option('--use-permessage-deflate', '--use_permessage_deflate',
-                      dest='use_permessage_deflate',
-                      action='store_true', default=False,
-                      help='Use the permessage-deflate extension.')
-    parser.add_option('--log-level', '--log_level', type='choice',
-                      dest='log_level', default='warn',
-                      choices=['debug', 'info', 'warn', 'error', 'critical'],
-                      help='Log level.')
-
-    (options, unused_args) = parser.parse_args()
-
-    logging.basicConfig(level=logging.getLevelName(options.log_level.upper()))
-
-    if options.draft75:
-        logging.critical('--draft75 option is obsolete.')
-        sys.exit(1)
-
-    if options.protocol_version == _PROTOCOL_VERSION_HIXIE75:
-        logging.critical(
-            'Value %s is obsolete for --protocol_version options' %
-            _PROTOCOL_VERSION_HIXIE75)
-        sys.exit(1)
-
-    if options.use_tls:
-        if options.tls_module is None:
-            if _import_ssl():
-                options.tls_module = _TLS_BY_STANDARD_MODULE
-                logging.debug('Using ssl module')
-            elif _import_pyopenssl():
-                options.tls_module = _TLS_BY_PYOPENSSL
-                logging.debug('Using pyOpenSSL module')
-            else:
-                logging.critical(
-                        'TLS support requires ssl or pyOpenSSL module.')
-                sys.exit(1)
-        elif options.tls_module == _TLS_BY_STANDARD_MODULE:
-            if not _import_ssl():
-                logging.critical('ssl module is not available')
-                sys.exit(1)
-        elif options.tls_module == _TLS_BY_PYOPENSSL:
-            if not _import_pyopenssl():
-                logging.critical('pyOpenSSL module is not available')
-                sys.exit(1)
-        else:
-            logging.critical('Invalid --tls-module option: %r',
-                             options.tls_module)
-            sys.exit(1)
-
-        if (options.disable_tls_compression and
-            options.tls_module != _TLS_BY_PYOPENSSL):
-            logging.critical('You can disable TLS compression only when '
-                             'pyOpenSSL module is used.')
-            sys.exit(1)
-    else:
-        if options.tls_module is not None:
-            logging.critical('Use --tls-module option only together with '
-                             '--use-tls option.')
-            sys.exit(1)
-
-        if options.disable_tls_compression:
-            logging.critical('Use --disable-tls-compression only together '
-                             'with --use-tls option.')
-            sys.exit(1)
-
-    # Default port number depends on whether TLS is used.
-    if options.server_port == _UNDEFINED_PORT:
-        if options.use_tls:
-            options.server_port = common.DEFAULT_WEB_SOCKET_SECURE_PORT
-        else:
-            options.server_port = common.DEFAULT_WEB_SOCKET_PORT
-
-    # optparse doesn't seem to handle non-ascii default values.
-    # Set default message here.
-    if not options.message:
-        options.message = u'Hello,\u65e5\u672c'   # "Japan" in Japanese
-
-    EchoClient(options).run()
-
-
-if __name__ == '__main__':
-    main()
-
-
-# vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/example/fetch_benchmark.html b/tests/wpt/web-platform-tests/tools/pywebsocket/example/fetch_benchmark.html
deleted file mode 100644
index 2105eb67a55..00000000000
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/example/fetch_benchmark.html
+++ /dev/null
@@ -1,163 +0,0 @@
-<!--
-Copyright 2015 Google Inc. All rights reserved.
-
-Use of this source code is governed by a BSD-style
-license that can be found in the COPYING file or at
-https://developers.google.com/open-source/licenses/bsd
--->
-<html>
-<head>
-<title>Fetch API benchmark</title>
-<script src="util_main.js"></script>
-<script src="util.js"></script>
-<script src="fetch_benchmark.js"></script>
-<script>
-var addressBox = null;
-
-function getConfig() {
-  return {
-    prefixUrl: addressBox.value,
-    printSize: getBoolFromCheckBox('printsize'),
-    numFetches: getIntFromInput('numFetches'),
-    // Initial size of messages.
-    numIterations: getIntFromInput('numiterations'),
-    numWarmUpIterations: getIntFromInput('numwarmupiterations'),
-    startSize: getIntFromInput('startsize'),
-    // Stops benchmark when the size of message exceeds this threshold.
-    stopThreshold: getIntFromInput('stopthreshold'),
-    multipliers: getFloatArrayFromInput('multipliers'),
-    verifyData: getBoolFromCheckBox('verifydata'),
-    addToLog: addToLog,
-    addToSummary: addToSummary,
-    measureValue: measureValue,
-    notifyAbort: notifyAbort
-  };
-}
-
-function onSendBenchmark() {
-  var config = getConfig();
-  config.dataType = getStringFromRadioBox('datatyperadio');
-  doAction(config, getBoolFromCheckBox('worker'), 'sendBenchmark');
-}
-
-function onReceiveBenchmark() {
-  var config = getConfig();
-  config.dataType = getStringFromRadioBox('datatyperadio');
-  doAction(config, getBoolFromCheckBox('worker'), 'receiveBenchmark');
-}
-
-function onBatchBenchmark() {
-  var config = getConfig();
-  doAction(config, getBoolFromCheckBox('worker'), 'batchBenchmark');
-}
-
-function onStop() {
-  var config = getConfig();
-  doAction(config, getBoolFromCheckBox('worker'), 'stop');
-}
-
-function init() {
-  addressBox = document.getElementById('address');
-  logBox = document.getElementById('log');
-
-  summaryBox = document.getElementById('summary');
-
-  // Special address of pywebsocket for XHR/Fetch API benchmark.
-  addressBox.value = '/073be001e10950692ccbf3a2ad21c245';
-
-  addToLog(window.navigator.userAgent.toLowerCase());
-  addToSummary(window.navigator.userAgent.toLowerCase());
-
-  initWorker('fetch', '');
-}
-</script>
-</head>
-<body onload="init()">
-
-<form id="benchmark_form">
-  url prefix <input type="text" id="address" size="40">
-  <input type="button" value="send" onclick="onSendBenchmark()">
-  <input type="button" value="receive" onclick="onReceiveBenchmark()">
-  <input type="button" value="batch" onclick="onBatchBenchmark()">
-  <input type="button" value="stop" onclick="onStop()">
-
-  <br/>
-
-  <input type="checkbox" id="printsize" checked>
-  <label for="printsize">Print size and time per message</label>
-  <input type="checkbox" id="verifydata" checked>
-  <label for="verifydata">Verify data</label>
-  <input type="checkbox" id="worker">
-  <label for="worker">Run on worker</label>
-
-  <br/>
-
-  Parameters:
-
-  <br/>
-
-  <table>
-    <tr>
-      <td>Number of fetch() requests</td>
-      <td><input type="text" id="numFetches" value="1"></td>
-    </tr>
-    <tr>
-      <td>Number of iterations</td>
-      <td><input type="text" id="numiterations" value="1"></td>
-    </tr>
-    <tr>
-      <td>Number of warm-up iterations</td>
-      <td><input type="text" id="numwarmupiterations" value="0"></td>
-    </tr>
-    <tr>
-      <td>Start size</td>
-      <td><input type="text" id="startsize" value="10240"></td>
-    </tr>
-    <tr>
-      <td>Stop threshold</td>
-      <td><input type="text" id="stopthreshold" value="102400000"></td>
-    </tr>
-    <tr>
-      <td>Multipliers</td>
-      <td><input type="text" id="multipliers" value="5, 2"></td>
-    </tr>
-  </table>
-
-  Set data type
-  <input type="radio"
-         name="datatyperadio"
-         id="datatyperadiotext"
-         value="text"
-         checked><label for="datatyperadiotext">text</label>
-  <input type="radio"
-         name="datatyperadio"
-         id="datatyperadioblob"
-         value="blob"
-         ><label for="datatyperadioblob">blob</label>
-  <input type="radio"
-         name="datatyperadio"
-         id="datatyperadioarraybuffer"
-         value="arraybuffer"
-         ><label for="datatyperadioarraybuffer">arraybuffer</label>
-</form>
-
-<div id="log_div">
-  <textarea
-      id="log" rows="20" style="width: 100%" readonly></textarea>
-</div>
-<div id="summary_div">
-  Summary
-  <textarea
-      id="summary" rows="20" style="width: 100%" readonly></textarea>
-</div>
-
-<div id="note_div">
-  Note:
-  <ul>
-    <li>Effect of RTT and time spent for ArrayBuffer creation in receive benchmarks are not eliminated.</li>
-    <li>The Stddev column shows NaN when the number of iterations is set to 1.</li>
-  </ul>
-</div>
-
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/example/fetch_benchmark.js b/tests/wpt/web-platform-tests/tools/pywebsocket/example/fetch_benchmark.js
deleted file mode 100644
index 13952190a8e..00000000000
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/example/fetch_benchmark.js
+++ /dev/null
@@ -1,225 +0,0 @@
-// Copyright 2015 Google Inc. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the COPYING file or at
-// https://developers.google.com/open-source/licenses/bsd
-
-var isWorker = typeof importScripts !== "undefined";
-
-if (isWorker) {
-  // Running on a worker
-  importScripts('util.js', 'util_worker.js');
-}
-
-// Namespace for holding globals.
-var benchmark = {};
-benchmark.startTimeInMs = 0;
-
-var timerID = null;
-
-function sendBenchmarkStep(size, config, isWarmUp) {
-  timerID = null;
-  benchmark.startTimeInMs = null;
-
-  // Prepare data.
-  var dataArray = [];
-  for (var i = 0; i < config.numFetches; ++i) {
-    var data = null;
-    if (config.dataType == 'arraybuffer' ||
-        config.dataType == 'blob') {
-      data = new ArrayBuffer(size);
-
-      fillArrayBuffer(data, 0x61);
-
-      if (config.dataType == 'blob') {
-        data = new Blob([data]);
-      }
-    } else {
-      data = repeatString('a', size);
-    }
-
-    dataArray.push(data);
-  }
-
-  // Start time measuring.
-  benchmark.startTimeInMs = getTimeStamp();
-
-  // Start fetch.
-  var promises = [];
-  for (var i = 0; i < config.numFetches; ++i) {
-    var data = dataArray[i];
-    var promise = fetch(config.prefixUrl + '_send',
-                        {method: 'POST', body: data})
-        .then(function (response) {
-          if (response.status != 200) {
-            config.addToLog('Failed (status=' + response.status + ')');
-            return Promise.reject();
-          }
-          // Check and warn if proxy is enabled.
-          if (response.headers.get('Via') !== null) {
-            config.addToLog('WARNING: proxy seems enabled.');
-          }
-          if (config.verifyData) {
-            return response.text()
-                .then(function(text) {
-                  if (!verifyAcknowledgement(config, text, size)) {
-                    return Promise.reject();
-                  }
-                });
-          }
-        });
-    promises.push(promise);
-  }
-
-  // Finish and report time measuring.
-  Promise.all(promises)
-      .then(function() {
-        if (benchmark.startTimeInMs == null) {
-          config.addToLog('startTimeInMs not set');
-          return Promise.reject();
-        }
-        calculateAndLogResult(config, size, benchmark.startTimeInMs,
-          size * config.numFetches, isWarmUp);
-        runNextTask(config);
-      })
-      .catch(function(e) {
-        config.addToLog("ERROR: " + e);
-        config.notifyAbort();
-      });
-}
-
-function receiveBenchmarkStep(size, config, isWarmUp) {
-  timerID = null;
-  benchmark.startTimeInMs = null;
-
-  // Start time measuring.
-  benchmark.startTimeInMs = getTimeStamp();
-
-  // Start fetch.
-  var promises = [];
-  for (var i = 0; i < config.numFetches; ++i) {
-    var request;
-    if (config.methodAndCache === 'GET-NOCACHE') {
-      request = new Request(config.prefixUrl + '_receive_getnocache?' + size,
-                            {method: 'GET'});
-    } else if (config.methodAndCache === 'GET-CACHE') {
-      request = new Request(config.prefixUrl + '_receive_getcache?' + size,
-                            {method: 'GET'});
-    } else {
-      request = new Request(config.prefixUrl + '_receive',
-                            {method: 'POST', body: size + ' none'});
-    }
-    var promise = fetch(request)
-        .then(function(response) {
-          if (response.status != 200) {
-            config.addToLog('Failed (status=' + this.status + ')');
-            return Promise.reject();
-          }
-          // Check and warn if proxy is enabled.
-          if (response.headers.get('Via') !== null) {
-            config.addToLog('WARNING: proxy seems enabled.');
-          }
-          if (config.dataType === 'arraybuffer') {
-            return response.arrayBuffer()
-                .then(function(arrayBuffer) {
-                  return [arrayBuffer.byteLength,
-                          (!config.verifyData ||
-                           verifyArrayBuffer(arrayBuffer, 0x61))];
-                });
-          } else if (config.dataType == 'blob') {
-            return response.blob()
-                .then(function(blob) {
-                  return new Promise(function(resolve, reject) {
-                      if (config.verifyData) {
-                        verifyBlob(config, blob, 0x61,
-                            function(receivedSize, verificationResult) {
-                              resolve([receivedSize, verificationResult]);
-                            });
-                      } else {
-                        resolve([blob.size, true]);
-                      }
-                    });
-                });
-          } else {
-            return response.text()
-                .then(function(text) {
-                  return [text.length,
-                          (!config.verifyData ||
-                           text == repeatString('a', text.length))];
-                });
-          }
-        })
-        .then(function(receivedSizeAndVerificationResult) {
-          var receivedSize = receivedSizeAndVerificationResult[0];
-          var verificationResult = receivedSizeAndVerificationResult[1];
-          if (receivedSize !== size) {
-            config.addToLog('Expected ' + size +
-                            'B but received ' + receivedSize + 'B');
-            return Promise.reject();
-          }
-          if (!verificationResult) {
-            config.addToLog('Response verification failed');
-            return Promise.reject();
-          }
-        });
-    promises.push(promise);
-  }
-
-  // Finish and report time measuring.
-  Promise.all(promises)
-      .then(function() {
-        if (benchmark.startTimeInMs == null) {
-          config.addToLog('startTimeInMs not set');
-          return Promise.reject();
-        }
-        calculateAndLogResult(config, size, benchmark.startTimeInMs,
-                              size * config.numFetches, isWarmUp);
-        runNextTask(config);
-      })
-      .catch(function(e) {
-        config.addToLog("ERROR: " + e);
-        config.notifyAbort();
-      });
-}
-
-
-function getConfigString(config) {
-  return '(' + config.dataType +
-    ', verifyData=' + config.verifyData +
-    ', ' + (isWorker ? 'Worker' : 'Main') +
-    ', numFetches=' + config.numFetches +
-    ', numIterations=' + config.numIterations +
-    ', numWarmUpIterations=' + config.numWarmUpIterations +
-    ')';
-}
-
-function startBenchmark(config) {
-  clearTimeout(timerID);
-
-  runNextTask(config);
-}
-
-function batchBenchmark(originalConfig) {
-  originalConfig.addToLog('Batch benchmark');
-
-  tasks = [];
-  clearAverageData();
-
-  var dataTypes = ['text', 'blob', 'arraybuffer'];
-  var stepFuncs = [sendBenchmarkStep, receiveBenchmarkStep];
-  var names = ['Send', 'Receive'];
-  for (var i = 0; i < stepFuncs.length; ++i) {
-    for (var j = 0; j < dataTypes.length; ++j) {
-      var config = cloneConfig(originalConfig);
-      config.dataType = dataTypes[j];
-      addTasks(config, stepFuncs[i]);
-      addResultReportingTask(config,
-          names[i] + ' benchmark ' + getConfigString(config));
-    }
-  }
-
-  startBenchmark(config);
-}
-
-function cleanup() {
-}
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/example/fetch_performance_test_iframe.html b/tests/wpt/web-platform-tests/tools/pywebsocket/example/fetch_performance_test_iframe.html
deleted file mode 100644
index e12df2e7df4..00000000000
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/example/fetch_performance_test_iframe.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE html>
-<head>
-<script src="util.js"></script>
-<script src="performance_test_iframe.js"></script>
-<script src="fetch_benchmark.js"></script>
-</head>
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/example/performance_test_iframe.html b/tests/wpt/web-platform-tests/tools/pywebsocket/example/performance_test_iframe.html
deleted file mode 100644
index 78aede97a14..00000000000
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/example/performance_test_iframe.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE html>
-<head>
-<script src="util.js"></script>
-<script src="performance_test_iframe.js"></script>
-<script src="benchmark.js"></script>
-</head>
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/example/performance_test_iframe.js b/tests/wpt/web-platform-tests/tools/pywebsocket/example/performance_test_iframe.js
deleted file mode 100644
index 065b25bd1ff..00000000000
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/example/performance_test_iframe.js
+++ /dev/null
@@ -1,66 +0,0 @@
-function perfTestAddToLog(text) {
-  parent.postMessage({'command': 'log', 'value': text}, '*');
-}
-
-function perfTestAddToSummary(text) {
-}
-
-function perfTestMeasureValue(value) {
-  parent.postMessage({'command': 'measureValue', 'value': value}, '*');
-}
-
-function perfTestNotifyAbort() {
-  parent.postMessage({'command': 'notifyAbort'}, '*');
-}
-
-function getConfigForPerformanceTest(connectionType, dataType, async,
-                                     verifyData, numIterations,
-                                     numWarmUpIterations) {
-  var prefixUrl;
-  if (connectionType === 'WebSocket') {
-    prefixUrl = 'ws://' + location.host + '/benchmark_helper';
-  } else {
-    // XHR or fetch
-    prefixUrl = 'http://' + location.host + '/073be001e10950692ccbf3a2ad21c245';
-  }
-
-  return {
-    prefixUrl: prefixUrl,
-    printSize: true,
-    numXHRs: 1,
-    numFetches: 1,
-    numSockets: 1,
-    // + 1 is for a warmup iteration by the Telemetry framework.
-    numIterations: numIterations + numWarmUpIterations + 1,
-    numWarmUpIterations: numWarmUpIterations,
-    minTotal: 10240000,
-    startSize: 10240000,
-    stopThreshold: 10240000,
-    multipliers: [2],
-    verifyData: verifyData,
-    dataType: dataType,
-    async: async,
-    addToLog: perfTestAddToLog,
-    addToSummary: perfTestAddToSummary,
-    measureValue: perfTestMeasureValue,
-    notifyAbort: perfTestNotifyAbort
-  };
-}
-
-var data;
-onmessage = function(message) {
-  var action;
-  if (message.data.command === 'start') {
-    data = message.data;
-    initWorker(data.connectionType, 'http://' + location.host);
-    action = data.benchmarkName;
-  } else {
-    action = 'stop';
-  }
-
-  var config = getConfigForPerformanceTest(data.connectionType, data.dataType,
-                                           data.async, data.verifyData,
-                                           data.numIterations,
-                                           data.numWarmUpIterations);
-  doAction(config, data.isWorker, action);
-};
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/example/pywebsocket.conf b/tests/wpt/web-platform-tests/tools/pywebsocket/example/pywebsocket.conf
deleted file mode 100644
index 335d130a5c8..00000000000
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/example/pywebsocket.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2011, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#
-# Sample configuration file for apache2
-#
-LogLevel debug
-<IfModule python_module>
-  PythonPath "sys.path+['/mod_pywebsocket']"
-  PythonOption mod_pywebsocket.handler_root /var/www
-  PythonOption mod_pywebsocket.handler_scan /var/www/ws
-  #PythonOption mod_pywebsocket.allow_draft75 On
-  <Location /ws>
-    PythonHeaderParserHandler mod_pywebsocket.headerparserhandler
-  </Location>
-</IfModule>
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/example/util_main.js b/tests/wpt/web-platform-tests/tools/pywebsocket/example/util_main.js
deleted file mode 100644
index 471ed63fb5d..00000000000
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/example/util_main.js
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2014 Google Inc. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the COPYING file or at
-// https://developers.google.com/open-source/licenses/bsd
-
-// Utilities for example applications (for the main thread only).
-
-var logBox = null;
-var queuedLog = '';
-
-var summaryBox = null;
-
-function queueLog(log) {
-  queuedLog += log + '\n';
-}
-
-function addToLog(log) {
-  logBox.value += queuedLog;
-  queuedLog = '';
-  logBox.value += log + '\n';
-  logBox.scrollTop = 1000000;
-}
-
-function addToSummary(log) {
-  summaryBox.value += log + '\n';
-  summaryBox.scrollTop = 1000000;
-}
-
-// value: execution time in milliseconds.
-// config.measureValue is intended to be used in Performance Tests.
-// Do nothing here in non-PerformanceTest.
-function measureValue(value) {
-}
-
-// config.notifyAbort is called when the benchmark failed and aborted, and
-// intended to be used in Performance Tests.
-// Do nothing here in non-PerformanceTest.
-function notifyAbort() {
-}
-
-function getIntFromInput(id) {
-  return parseInt(document.getElementById(id).value);
-}
-
-function getStringFromRadioBox(name) {
-  var list = document.getElementById('benchmark_form')[name];
-  for (var i = 0; i < list.length; ++i)
-    if (list.item(i).checked)
-      return list.item(i).value;
-  return undefined;
-}
-function getBoolFromCheckBox(id) {
-  return document.getElementById(id).checked;
-}
-
-function getIntArrayFromInput(id) {
-  var strArray = document.getElementById(id).value.split(',');
-  return strArray.map(function(str) { return parseInt(str, 10); });
-}
-
-function getFloatArrayFromInput(id) {
-  var strArray = document.getElementById(id).value.split(',');
-  return strArray.map(parseFloat);
-}
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/example/util_worker.js b/tests/wpt/web-platform-tests/tools/pywebsocket/example/util_worker.js
deleted file mode 100644
index 98dcf441729..00000000000
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/example/util_worker.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2014 Google Inc. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the COPYING file or at
-// https://developers.google.com/open-source/licenses/bsd
-
-// Utilities for example applications (for the worker threads only).
-
-onmessage = function (message) {
-  var config = message.data.config;
-  config.addToLog = function(text) {
-      postMessage({type: 'addToLog', data: text}); };
-  config.addToSummary = function(text) {
-      postMessage({type: 'addToSummary', data: text}); };
-  config.measureValue = function(value) {
-      postMessage({type: 'measureValue', data: value}); };
-  config.notifyAbort = function() { postMessage({type: 'notifyAbort'}); };
-
-  doAction(config, false, message.data.type);
-};
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/example/xhr_benchmark.html b/tests/wpt/web-platform-tests/tools/pywebsocket/example/xhr_benchmark.html
deleted file mode 100644
index 800d20c9ccb..00000000000
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/example/xhr_benchmark.html
+++ /dev/null
@@ -1,212 +0,0 @@
-<!--
-Copyright 2013, Google Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-
-<html>
-<head>
-<title>XMLHttpRequest benchmark</title>
-<script src="util_main.js"></script>
-<script src="util.js"></script>
-<script src="xhr_benchmark.js"></script>
-<script>
-var addressBox = null;
-
-function getConfig() {
-  return {
-    prefixUrl: addressBox.value,
-    printSize: getBoolFromCheckBox('printsize'),
-    numXHRs: getIntFromInput('numXHRs'),
-    async: getBoolFromCheckBox('async'),
-    // Initial size of messages.
-    numIterations: getIntFromInput('numiterations'),
-    numWarmUpIterations: getIntFromInput('numwarmupiterations'),
-    startSize: getIntFromInput('startsize'),
-    // Stops benchmark when the size of message exceeds this threshold.
-    stopThreshold: getIntFromInput('stopthreshold'),
-    multipliers: getFloatArrayFromInput('multipliers'),
-    verifyData: getBoolFromCheckBox('verifydata'),
-    methodAndCache: getStringFromRadioBox('methodandcache'),
-    addToLog: addToLog,
-    addToSummary: addToSummary,
-    measureValue: measureValue,
-    notifyAbort: notifyAbort
-  };
-}
-
-function onSendBenchmark() {
-  var config = getConfig();
-  config.dataType = getStringFromRadioBox('datatyperadio');
-  doAction(config, getBoolFromCheckBox('worker'), 'sendBenchmark');
-}
-
-function onReceiveBenchmark() {
-  var config = getConfig();
-  config.dataType = getStringFromRadioBox('datatyperadio');
-  doAction(config, getBoolFromCheckBox('worker'), 'receiveBenchmark');
-}
-
-function onBatchBenchmark() {
-  var config = getConfig();
-  doAction(config, getBoolFromCheckBox('worker'), 'batchBenchmark');
-}
-
-function onStop() {
-  var config = getConfig();
-  doAction(config, getBoolFromCheckBox('worker'), 'stop');
-}
-
-function init() {
-  addressBox = document.getElementById('address');
-  logBox = document.getElementById('log');
-
-  summaryBox = document.getElementById('summary');
-
-  // Special address of pywebsocket for XHR benchmark.
-  addressBox.value = '/073be001e10950692ccbf3a2ad21c245';
-
-  addToLog(window.navigator.userAgent.toLowerCase());
-  addToSummary(window.navigator.userAgent.toLowerCase());
-
-  initWorker('XHR', '');
-}
-</script>
-</head>
-<body onload="init()">
-
-<form id="benchmark_form">
-  url prefix <input type="text" id="address" size="40">
-  <input type="button" value="send" onclick="onSendBenchmark()">
-  <input type="button" value="receive" onclick="onReceiveBenchmark()">
-  <input type="button" value="batch" onclick="onBatchBenchmark()">
-  <input type="button" value="stop" onclick="onStop()">
-
-  <br/>
-
-  <input type="checkbox" id="printsize" checked>
-  <label for="printsize">Print size and time per message</label>
-  <input type="checkbox" id="verifydata" checked>
-  <label for="verifydata">Verify data</label>
-  <input type="checkbox" id="worker">
-  <label for="worker">Run on worker</label>
-  <input type="checkbox" id="async" checked>
-  <label for="async">Async</label><br>
-  (Receive &amp;&amp; Non-Worker &amp;&amp; Sync is not supported by spec)
-
-  <br/>
-
-  Parameters:
-
-  <br/>
-
-  <table>
-    <tr>
-      <td>Num XHRs</td>
-      <td><input type="text" id="numXHRs" value="1"></td>
-    </tr>
-    <tr>
-      <td>Number of iterations</td>
-      <td><input type="text" id="numiterations" value="1"></td>
-    </tr>
-    <tr>
-      <td>Number of warm-up iterations</td>
-      <td><input type="text" id="numwarmupiterations" value="0"></td>
-    </tr>
-    <tr>
-      <td>Start size</td>
-      <td><input type="text" id="startsize" value="10240"></td>
-    </tr>
-    <tr>
-      <td>Stop threshold</td>
-      <td><input type="text" id="stopthreshold" value="102400000"></td>
-    </tr>
-    <tr>
-      <td>Multipliers</td>
-      <td><input type="text" id="multipliers" value="5, 2"></td>
-    </tr>
-  </table>
-
-  Set data type
-  <input type="radio"
-         name="datatyperadio"
-         id="datatyperadiotext"
-         value="text"
-         checked><label for="datatyperadiotext">text</label>
-  <input type="radio"
-         name="datatyperadio"
-         id="datatyperadioblob"
-         value="blob"
-         ><label for="datatyperadioblob">blob</label>
-  <input type="radio"
-         name="datatyperadio"
-         id="datatyperadioarraybuffer"
-         value="arraybuffer"
-         ><label for="datatyperadioarraybuffer">arraybuffer</label>
-
-  <br>
-  Set HTTP method and cache control
-  <input type="radio"
-         name="methodandcache"
-         id="methodandcachePOST"
-         value="POST"
-         checked><label for="methodandcachePOST">POST (No Cache)</label>
-  <input type="radio"
-         name="methodandcache"
-         id="methodandcacheGETNOCACHE"
-         value="GET-NOCACHE"
-         ><label for="methodandcacheGETNOCACHE">GET (No Cache)</label>
-  <input type="radio"
-         name="methodandcache"
-         id="methodandcacheGETCACHE"
-         value="GET-CACHE"
-         ><label for="methodandcacheGETCACHE">GET (Cache)</label>
-  <br>
-  <span style="font-size: 80%">(Cache control: receive only. Cache is valid for 10 seconds. This config controls Cache-control HTTP response header. Browsers might not cache data e.g. when it is large)</span>
-</form>
-
-<div id="log_div">
-  <textarea
-      id="log" rows="20" style="width: 100%" readonly></textarea>
-</div>
-<div id="summary_div">
-  Summary
-  <textarea
-      id="summary" rows="20" style="width: 100%" readonly></textarea>
-</div>
-
-<div id="note_div">
-  Note:
-  <ul>
-    <li>Effect of RTT and time spent for ArrayBuffer creation in receive benchmarks are not eliminated.</li>
-    <li>The Stddev column shows NaN when the number of iterations is set to 1.</li>
-  </ul>
-</div>
-
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/example/xhr_benchmark.js b/tests/wpt/web-platform-tests/tools/pywebsocket/example/xhr_benchmark.js
deleted file mode 100644
index 14a97e8fb83..00000000000
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/example/xhr_benchmark.js
+++ /dev/null
@@ -1,292 +0,0 @@
-// Copyright 2014 Google Inc. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the COPYING file or at
-// https://developers.google.com/open-source/licenses/bsd
-
-var isWorker = typeof importScripts !== "undefined";
-
-if (isWorker) {
-  // Running on a worker
-  importScripts('util.js', 'util_worker.js');
-}
-
-// Namespace for holding globals.
-var benchmark = {};
-benchmark.startTimeInMs = 0;
-
-var xhrs = [];
-
-var timerID = null;
-
-function destroyAllXHRs() {
-  for (var i = 0; i < xhrs.length; ++i) {
-    xhrs[i].onreadystatechange = null;
-    // Abort XHRs if they are not yet DONE state.
-    // Calling abort() here (i.e. in onreadystatechange handler) 
-    // causes "NetworkError" messages in DevTools in sync mode,
-    // even if it is after transition to DONE state.
-    if (xhrs[i].readyState != XMLHttpRequest.DONE)
-      xhrs[i].abort();
-  }
-  xhrs = [];
-  // gc() might be needed for Chrome/Blob
-}
-
-function sendBenchmarkStep(size, config, isWarmUp) {
-  timerID = null;
-
-  benchmark.startTimeInMs = null;
-  var totalSize = 0;
-  var totalReplied = 0;
-
-  var onReadyStateChangeHandler = function () {
-    if (this.readyState != this.DONE) {
-      return;
-    }
-
-    if (this.status != 200) {
-      config.addToLog('Failed (status=' + this.status + ')');
-      destroyAllXHRs();
-      config.notifyAbort();
-      return;
-    }
-
-    if (config.verifyData &&
-        !verifyAcknowledgement(config, this.response, size)) {
-      destroyAllXHRs();
-      config.notifyAbort();
-      return;
-    }
-
-    totalReplied += size;
-
-    if (totalReplied < totalSize) {
-      return;
-    }
-
-    if (benchmark.startTimeInMs == null) {
-      config.addToLog('startTimeInMs not set');
-      destroyAllXHRs();
-      config.notifyAbort();
-      return;
-    }
-
-    // Check and warn if proxy is enabled.
-    if (this.getResponseHeader('Via') !== null) {
-      config.addToLog('WARNING: proxy seems enabled.');
-    }
-
-    calculateAndLogResult(config, size, benchmark.startTimeInMs, totalSize,
-        isWarmUp);
-
-    destroyAllXHRs();
-
-    runNextTask(config);
-  };
-
-  for (var i = 0; i < config.numXHRs; ++i) {
-    var xhr = new XMLHttpRequest();
-    xhr.onreadystatechange = onReadyStateChangeHandler;
-    xhrs.push(xhr);
-  }
-
-  var dataArray = [];
-
-  for (var i = 0; i < xhrs.length; ++i) {
-    var data = null;
-    if (config.dataType == 'arraybuffer' ||
-        config.dataType == 'blob') {
-      data = new ArrayBuffer(size);
-
-      fillArrayBuffer(data, 0x61);
-
-      if (config.dataType == 'blob') {
-        data = new Blob([data]);
-      }
-    } else {
-      data = repeatString('a', size);
-    }
-
-    dataArray.push(data);
-  }
-
-
-  benchmark.startTimeInMs = getTimeStamp();
-  totalSize = size * xhrs.length;
-
-  for (var i = 0; i < xhrs.length; ++i) {
-    var data = dataArray[i];
-    var xhr = xhrs[i];
-    xhr.open('POST', config.prefixUrl + '_send', config.async);
-    xhr.send(data);
-  }
-}
-
-function receiveBenchmarkStep(size, config, isWarmUp) {
-  timerID = null;
-
-  benchmark.startTimeInMs = null;
-  var totalSize = 0;
-  var totalReplied = 0;
-
-  var checkResultAndContinue = function (bytesReceived, verificationResult) {
-    if (!verificationResult) {
-      config.addToLog('Response verification failed');
-      destroyAllXHRs();
-      config.notifyAbort();
-      return;
-    }
-
-    totalReplied += bytesReceived;
-
-    if (totalReplied < totalSize) {
-      return;
-    }
-
-    if (benchmark.startTimeInMs == null) {
-      config.addToLog('startTimeInMs not set');
-      destroyAllXHRs();
-      config.notifyAbort();
-      return;
-    }
-
-    calculateAndLogResult(config, size, benchmark.startTimeInMs, totalSize,
-        isWarmUp);
-
-    destroyAllXHRs();
-
-    runNextTask(config);
-  }
-
-  var onReadyStateChangeHandler = function () {
-    if (this.readyState != this.DONE) {
-      return;
-    }
-
-    if (this.status != 200) {
-      config.addToLog('Failed (status=' + this.status + ')');
-      destroyAllXHRs();
-      config.notifyAbort();
-      return;
-    }
-
-    // Check and warn if proxy is enabled.
-    if (this.getResponseHeader('Via') !== null) {
-      config.addToLog('WARNING: proxy seems enabled.');
-    }
-
-    var bytesReceived = -1;
-    if (this.responseType == 'arraybuffer') {
-      bytesReceived = this.response.byteLength;
-    } else if (this.responseType == 'blob') {
-      bytesReceived = this.response.size;
-    } else {
-      bytesReceived = this.response.length;
-    }
-    if (bytesReceived != size) {
-      config.addToLog('Expected ' + size +
-          'B but received ' + bytesReceived + 'B');
-      destroyAllXHRs();
-      config.notifyAbort();
-      return;
-    }
-
-    if (this.responseType == 'arraybuffer') {
-      checkResultAndContinue(bytesReceived,
-          !config.verifyData || verifyArrayBuffer(this.response, 0x61));
-    } else if (this.responseType == 'blob') {
-      if (config.verifyData)
-        verifyBlob(config, this.response, 0x61, checkResultAndContinue);
-      else
-        checkResultAndContinue(bytesReceived, true);
-    } else {
-      checkResultAndContinue(
-          bytesReceived,
-          !config.verifyData ||
-              this.response == repeatString('a', this.response.length));
-    }
-  };
-
-  for (var i = 0; i < config.numXHRs; ++i) {
-    var xhr = new XMLHttpRequest();
-    xhr.onreadystatechange = onReadyStateChangeHandler;
-    xhrs.push(xhr);
-  }
-
-  benchmark.startTimeInMs = getTimeStamp();
-  totalSize = size * xhrs.length;
-
-  for (var i = 0; i < xhrs.length; ++i) {
-    var xhr = xhrs[i];
-    if (config.methodAndCache === 'GET-NOCACHE') {
-      xhr.open('GET', config.prefixUrl + '_receive_getnocache?' + size,
-          config.async);
-      xhr.responseType = config.dataType;
-      xhr.send();
-    } else if (config.methodAndCache === 'GET-CACHE') {
-      xhr.open('GET', config.prefixUrl + '_receive_getcache?' + size,
-          config.async);
-      xhr.responseType = config.dataType;
-      xhr.send();
-    } else {
-      xhr.open('POST', config.prefixUrl + '_receive', config.async);
-      xhr.responseType = config.dataType;
-      xhr.send(size + ' none');
-    }
-  }
-}
-
-
-function getConfigString(config) {
-  return '(' + config.dataType +
-    ', verifyData=' + config.verifyData +
-    ', ' + (isWorker ? 'Worker' : 'Main') +
-    ', ' + (config.async ? 'Async' : 'Sync') +
-    ', numXHRs=' + config.numXHRs +
-    ', numIterations=' + config.numIterations +
-    ', numWarmUpIterations=' + config.numWarmUpIterations +
-    ')';
-}
-
-function startBenchmark(config) {
-  clearTimeout(timerID);
-  destroyAllXHRs();
-
-  runNextTask(config);
-}
-
-function batchBenchmark(originalConfig) {
-  originalConfig.addToLog('Batch benchmark');
-
-  tasks = [];
-  clearAverageData();
-
-  var dataTypes = ['text', 'blob', 'arraybuffer'];
-  var stepFuncs = [sendBenchmarkStep, receiveBenchmarkStep];
-  var names = ['Send', 'Receive'];
-  var async = [true, false];
-  for (var i = 0; i < stepFuncs.length; ++i) {
-    for (var j = 0; j < dataTypes.length; ++j) {
-      for (var k = 0; k < async.length; ++k) {
-        var config = cloneConfig(originalConfig);
-        config.dataType = dataTypes[j];
-        config.async = async[k];
-
-        // Receive && Non-Worker && Sync is not supported by the spec
-        if (stepFuncs[i] === receiveBenchmarkStep && !isWorker &&
-            !config.async)
-          continue;
-
-        addTasks(config, stepFuncs[i]);
-        addResultReportingTask(config,
-            names[i] + ' benchmark ' + getConfigString(config));
-      }
-    }
-  }
-
-  startBenchmark(config);
-}
-
-function cleanup() {
-}
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/example/xhr_event_logger.html b/tests/wpt/web-platform-tests/tools/pywebsocket/example/xhr_event_logger.html
deleted file mode 100644
index 50db0fbec49..00000000000
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/example/xhr_event_logger.html
+++ /dev/null
@@ -1,123 +0,0 @@
-<!--
-Copyright 2014 Google Inc. All rights reserved.
-
-Use of this source code is governed by a BSD-style
-license that can be found in the COPYING file or at
-https://developers.google.com/open-source/licenses/bsd
--->
-
-<html>
-<head>
-<title>XHR event logger</title>
-<script src="util_main.js"></script>
-<script>
-var events = [];
-var startTime = 0;
-
-function run() {
-  events = [];
-  startTime = Date.now();
-
-  function pushToLog(type) {
-    var time = Date.now();
-    if (events.length != 0 && type === events[events.length - 1].type) {
-      events[events.length - 1].count += 1;
-      events[events.length - 1].last = time;
-    } else {
-      events.push({type: type, count: 1, first: time, last: time});
-    }
-  }
-
-  var xhr = new XMLHttpRequest();
-
-  function getProgressEventDump(e) {
-    return '(' + e.lengthComputable + ', ' + e.loaded + ', ' + e.total + ')';
-  }
-
-  var dumpProgressEvent = getBoolFromCheckBox('dumpprogressevent');
-
-  function log(e) {
-    var type = e.type;
-    if (type === 'readystatechange') {
-      type += e.target.readyState;
-    }
-    if (dumpProgressEvent && (e instanceof ProgressEvent)) {
-      type += getProgressEventDump(e);
-    }
-    pushToLog(type);
-  };
-
-  function logUpload(e) {
-    var type = e.type;
-    if (dumpProgressEvent && (e instanceof ProgressEvent)) {
-      type += getProgressEventDump(e);
-    }
-    pushToLog('upload' + type);
-  }
-
-  if (getBoolFromCheckBox('upload')) {
-    var upload = xhr.upload;
-    upload.onloadstart = logUpload;
-    upload.onprogress = logUpload;
-    upload.onabort = logUpload;
-    upload.onerror = logUpload;
-    upload.onload = logUpload;
-    upload.ontimeout = logUpload;
-    upload.onloadend = logUpload;
-  }
-
-  xhr.onreadystatechange = log;
-  xhr.onloadstart = log;
-  xhr.onprogress = log;
-  xhr.onabort = log;
-  xhr.onerror = log;
-  xhr.onload = log;
-  xhr.ontimeout = log;
-  xhr.onloadend = log;
-
-  xhr.open('POST', '/073be001e10950692ccbf3a2ad21c245_receive',
-           getBoolFromCheckBox('async'));
-  var size = getIntFromInput('size');
-  var chunkedMode = 'none';
-  if (getBoolFromCheckBox('chunkedresponse')) {
-    chunkedMode = 'chunked';
-  }
-  xhr.send(size + ' ' + chunkedMode);
-}
-
-function print() {
-  var result = '';
-  for (var i = 0; i < events.length; ++i) {
-    var event = events[i];
-    var line = '';
-    line += (event.first - startTime) + "ms";
-    if (event.count > 1)
-      line += "-" + (event.last - startTime) + "ms";
-    else
-      line += "        ";
-    while(line.length < 15)
-      line += " ";
-    line += ": " + event.type + ' * ' + event.count + '\n';
-    result += line;
-  }
-  document.getElementById('log').value = result;
-}
-</script>
-
-<body>
-  <textarea id="log" rows="10" cols="70" readonly></textarea>
-  <br/>
-  Size: <input type="text" id="size" value="65536"><br/>
-  <input type="checkbox" id="chunkedresponse">
-  <label for="chunkedresponse">Use Chunked T-E for response</label><br/>
-  <input type="checkbox" id="upload">
-  <label for="upload">Upload progress</label><br/>
-  <input type="checkbox" id="dumpprogressevent">
-  <label for="dumpprogressevent">
-    Dump lengthComputable/loaded/total</label><br/>
-  <input type="checkbox" id="async" checked>
-  <label for="async">Async</label><br/>
-  <input type="button" onclick="run()" value="Run XHR">
-  <input type="button" onclick="print()" value="Print log">
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/example/xhr_performance_test_iframe.html b/tests/wpt/web-platform-tests/tools/pywebsocket/example/xhr_performance_test_iframe.html
deleted file mode 100644
index ab02c9ea56f..00000000000
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/example/xhr_performance_test_iframe.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE html>
-<head>
-<script src="util.js"></script>
-<script src="performance_test_iframe.js"></script>
-<script src="xhr_benchmark.js"></script>
-</head>
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/_stream_base.py b/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/_stream_base.py
deleted file mode 100644
index 21a1254ae6d..00000000000
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/_stream_base.py
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 2011, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-"""Base stream class.
-"""
-
-
-# Note: request.connection.write/read are used in this module, even though
-# mod_python document says that they should be used only in connection
-# handlers. Unfortunately, we have no other options. For example,
-# request.write/read are not suitable because they don't allow direct raw bytes
-# writing/reading.
-
-
-import socket
-
-from mod_pywebsocket import util
-
-
-# Exceptions
-
-
-class ConnectionTerminatedException(Exception):
-    """This exception will be raised when a connection is terminated
-    unexpectedly.
-    """
-
-    pass
-
-
-class InvalidFrameException(ConnectionTerminatedException):
-    """This exception will be raised when we received an invalid frame we
-    cannot parse.
-    """
-
-    pass
-
-
-class BadOperationException(Exception):
-    """This exception will be raised when send_message() is called on
-    server-terminated connection or receive_message() is called on
-    client-terminated connection.
-    """
-
-    pass
-
-
-class UnsupportedFrameException(Exception):
-    """This exception will be raised when we receive a frame with flag, opcode
-    we cannot handle. Handlers can just catch and ignore this exception and
-    call receive_message() again to continue processing the next frame.
-    """
-
-    pass
-
-
-class InvalidUTF8Exception(Exception):
-    """This exception will be raised when we receive a text frame which
-    contains invalid UTF-8 strings.
-    """
-
-    pass
-
-
-class StreamBase(object):
-    """Base stream class."""
-
-    def __init__(self, request):
-        """Construct an instance.
-
-        Args:
-            request: mod_python request.
-        """
-
-        self._logger = util.get_class_logger(self)
-
-        self._request = request
-
-    def _read(self, length):
-        """Reads length bytes from connection. In case we catch any exception,
-        prepends remote address to the exception message and raise again.
-
-        Raises:
-            ConnectionTerminatedException: when read returns empty string.
-        """
-
-        try:
-            read_bytes = self._request.connection.read(length)
-            if not read_bytes:
-                raise ConnectionTerminatedException(
-                    'Receiving %d byte failed. Peer (%r) closed connection' %
-                    (length, (self._request.connection.remote_addr,)))
-            return read_bytes
-        except socket.error as e:
-            # Catch a socket.error. Because it's not a child class of the
-            # IOError prior to Python 2.6, we cannot omit this except clause.
-            # Use %s rather than %r for the exception to use human friendly
-            # format.
-            raise ConnectionTerminatedException(
-                'Receiving %d byte failed. socket.error (%s) occurred' %
-                (length, e))
-        except IOError as e:
-            # Also catch an IOError because mod_python throws it.
-            raise ConnectionTerminatedException(
-                'Receiving %d byte failed. IOError (%s) occurred' %
-                (length, e))
-
-    def _write(self, bytes_to_write):
-        """Writes given bytes to connection. In case we catch any exception,
-        prepends remote address to the exception message and raise again.
-        """
-
-        try:
-            self._request.connection.write(bytes_to_write)
-        except Exception as e:
-            util.prepend_message_to_exception(
-                    'Failed to send message to %r: ' %
-                            (self._request.connection.remote_addr,),
-                    e)
-            raise
-
-    def receive_bytes(self, length):
-        """Receives multiple bytes. Retries read when we couldn't receive the
-        specified amount.
-
-        Raises:
-            ConnectionTerminatedException: when read returns empty string.
-        """
-
-        read_bytes = []
-        while length > 0:
-            new_read_bytes = self._read(length)
-            read_bytes.append(new_read_bytes)
-            length -= len(new_read_bytes)
-        return ''.join(read_bytes)
-
-    def _read_until(self, delim_char):
-        """Reads bytes until we encounter delim_char. The result will not
-        contain delim_char.
-
-        Raises:
-            ConnectionTerminatedException: when read returns empty string.
-        """
-
-        read_bytes = []
-        while True:
-            ch = self._read(1)
-            if ch == delim_char:
-                break
-            read_bytes.append(ch)
-        return ''.join(read_bytes)
-
-
-# vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/_stream_hixie75.py b/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/_stream_hixie75.py
deleted file mode 100644
index 94cf5b31ba0..00000000000
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/_stream_hixie75.py
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 2011, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-"""This file provides a class for parsing/building frames of the WebSocket
-protocol version HyBi 00 and Hixie 75.
-
-Specification:
-- HyBi 00 http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-00
-- Hixie 75 http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-75
-"""
-
-
-from mod_pywebsocket import common
-from mod_pywebsocket._stream_base import BadOperationException
-from mod_pywebsocket._stream_base import ConnectionTerminatedException
-from mod_pywebsocket._stream_base import InvalidFrameException
-from mod_pywebsocket._stream_base import StreamBase
-from mod_pywebsocket._stream_base import UnsupportedFrameException
-from mod_pywebsocket import util
-
-
-class StreamHixie75(StreamBase):
-    """A class for parsing/building frames of the WebSocket protocol version
-    HyBi 00 and Hixie 75.
-    """
-
-    def __init__(self, request, enable_closing_handshake=False):
-        """Construct an instance.
-
-        Args:
-            request: mod_python request.
-            enable_closing_handshake: to let StreamHixie75 perform closing
-                                      handshake as specified in HyBi 00, set
-                                      this option to True.
-        """
-
-        StreamBase.__init__(self, request)
-
-        self._logger = util.get_class_logger(self)
-
-        self._enable_closing_handshake = enable_closing_handshake
-
-        self._request.client_terminated = False
-        self._request.server_terminated = False
-
-    def send_message(self, message, end=True, binary=False):
-        """Send message.
-
-        Args:
-            message: unicode string to send.
-            binary: not used in hixie75.
-
-        Raises:
-            BadOperationException: when called on a server-terminated
-                connection.
-        """
-
-        if not end:
-            raise BadOperationException(
-                'StreamHixie75 doesn\'t support send_message with end=False')
-
-        if binary:
-            raise BadOperationException(
-                'StreamHixie75 doesn\'t support send_message with binary=True')
-
-        if self._request.server_terminated:
-            raise BadOperationException(
-                'Requested send_message after sending out a closing handshake')
-
-        self._write(''.join(['\x00', message.encode('utf-8'), '\xff']))
-
-    def _read_payload_length_hixie75(self):
-        """Reads a length header in a Hixie75 version frame with length.
-
-        Raises:
-            ConnectionTerminatedException: when read returns empty string.
-        """
-
-        length = 0
-        while True:
-            b_str = self._read(1)
-            b = ord(b_str)
-            length = length * 128 + (b & 0x7f)
-            if (b & 0x80) == 0:
-                break
-        return length
-
-    def receive_message(self):
-        """Receive a WebSocket frame and return its payload an unicode string.
-
-        Returns:
-            payload unicode string in a WebSocket frame.
-
-        Raises:
-            ConnectionTerminatedException: when read returns empty
-                string.
-            BadOperationException: when called on a client-terminated
-                connection.
-        """
-
-        if self._request.client_terminated:
-            raise BadOperationException(
-                'Requested receive_message after receiving a closing '
-                'handshake')
-
-        while True:
-            # Read 1 byte.
-            # mp_conn.read will block if no bytes are available.
-            # Timeout is controlled by TimeOut directive of Apache.
-            frame_type_str = self.receive_bytes(1)
-            frame_type = ord(frame_type_str)
-            if (frame_type & 0x80) == 0x80:
-                # The payload length is specified in the frame.
-                # Read and discard.
-                length = self._read_payload_length_hixie75()
-                if length > 0:
-                    _ = self.receive_bytes(length)
-                # 5.3 3. 12. if /type/ is 0xFF and /length/ is 0, then set the
-                # /client terminated/ flag and abort these steps.
-                if not self._enable_closing_handshake:
-                    continue
-
-                if frame_type == 0xFF and length == 0:
-                    self._request.client_terminated = True
-
-                    if self._request.server_terminated:
-                        self._logger.debug(
-                            'Received ack for server-initiated closing '
-                            'handshake')
-                        return None
-
-                    self._logger.debug(
-                        'Received client-initiated closing handshake')
-
-                    self._send_closing_handshake()
-                    self._logger.debug(
-                        'Sent ack for client-initiated closing handshake')
-                    return None
-            else:
-                # The payload is delimited with \xff.
-                bytes = self._read_until('\xff')
-                # The WebSocket protocol section 4.4 specifies that invalid
-                # characters must be replaced with U+fffd REPLACEMENT
-                # CHARACTER.
-                message = bytes.decode('utf-8', 'replace')
-                if frame_type == 0x00:
-                    return message
-                # Discard data of other types.
-
-    def _send_closing_handshake(self):
-        if not self._enable_closing_handshake:
-            raise BadOperationException(
-                'Closing handshake is not supported in Hixie 75 protocol')
-
-        self._request.server_terminated = True
-
-        # 5.3 the server may decide to terminate the WebSocket connection by
-        # running through the following steps:
-        # 1. send a 0xFF byte and a 0x00 byte to the client to indicate the
-        # start of the closing handshake.
-        self._write('\xff\x00')
-
-    def close_connection(self, unused_code='', unused_reason=''):
-        """Closes a WebSocket connection.
-
-        Raises:
-            ConnectionTerminatedException: when closing handshake was
-                not successfull.
-        """
-
-        if self._request.server_terminated:
-            self._logger.debug(
-                'Requested close_connection but server is already terminated')
-            return
-
-        if not self._enable_closing_handshake:
-            self._request.server_terminated = True
-            self._logger.debug('Connection closed')
-            return
-
-        self._send_closing_handshake()
-        self._logger.debug('Sent server-initiated closing handshake')
-
-        # TODO(ukai): 2. wait until the /client terminated/ flag has been set,
-        # or until a server-defined timeout expires.
-        #
-        # For now, we expect receiving closing handshake right after sending
-        # out closing handshake, and if we couldn't receive non-handshake
-        # frame, we take it as ConnectionTerminatedException.
-        message = self.receive_message()
-        if message is not None:
-            raise ConnectionTerminatedException(
-                'Didn\'t receive valid ack for closing handshake')
-        # TODO: 3. close the WebSocket connection.
-        # note: mod_python Connection (mp_conn) doesn't have close method.
-
-    def send_ping(self, body):
-        raise BadOperationException(
-            'StreamHixie75 doesn\'t support send_ping')
-
-
-# vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/handshake/hybi00.py b/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/handshake/hybi00.py
deleted file mode 100644
index 8757717a639..00000000000
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/handshake/hybi00.py
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 2011, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-"""This file provides the opening handshake processor for the WebSocket
-protocol version HyBi 00.
-
-Specification:
-http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-00
-"""
-
-
-# Note: request.connection.write/read are used in this module, even though
-# mod_python document says that they should be used only in connection
-# handlers. Unfortunately, we have no other options. For example,
-# request.write/read are not suitable because they don't allow direct raw bytes
-# writing/reading.
-
-
-import logging
-import re
-import struct
-
-from mod_pywebsocket import common
-from mod_pywebsocket.stream import StreamHixie75
-from mod_pywebsocket import util
-from mod_pywebsocket.handshake._base import HandshakeException
-from mod_pywebsocket.handshake._base import check_request_line
-from mod_pywebsocket.handshake._base import format_header
-from mod_pywebsocket.handshake._base import get_default_port
-from mod_pywebsocket.handshake._base import get_mandatory_header
-from mod_pywebsocket.handshake._base import parse_host_header
-from mod_pywebsocket.handshake._base import validate_mandatory_header
-
-
-_MANDATORY_HEADERS = [
-    # key, expected value or None
-    [common.UPGRADE_HEADER, common.WEBSOCKET_UPGRADE_TYPE_HIXIE75],
-    [common.CONNECTION_HEADER, common.UPGRADE_CONNECTION_TYPE],
-]
-
-
-def _validate_subprotocol(subprotocol):
-    """Checks if characters in subprotocol are in range between U+0020 and
-    U+007E. A value in the Sec-WebSocket-Protocol field need to satisfy this
-    requirement.
-
-    See the Section 4.1. Opening handshake of the spec.
-    """
-
-    if not subprotocol:
-        raise HandshakeException('Invalid subprotocol name: empty')
-
-    # Parameter should be in the range U+0020 to U+007E.
-    for c in subprotocol:
-        if not 0x20 <= ord(c) <= 0x7e:
-            raise HandshakeException(
-                'Illegal character in subprotocol name: %r' % c)
-
-
-def _check_header_lines(request, mandatory_headers):
-    check_request_line(request)
-
-    # The expected field names, and the meaning of their corresponding
-    # values, are as follows.
-    #  |Upgrade| and |Connection|
-    for key, expected_value in mandatory_headers:
-        validate_mandatory_header(request, key, expected_value)
-
-
-def _build_location(request):
-    """Build WebSocket location for request."""
-
-    location_parts = []
-    if request.is_https():
-        location_parts.append(common.WEB_SOCKET_SECURE_SCHEME)
-    else:
-        location_parts.append(common.WEB_SOCKET_SCHEME)
-    location_parts.append('://')
-    host, port = parse_host_header(request)
-    connection_port = request.connection.local_addr[1]
-    if port != connection_port:
-        raise HandshakeException('Header/connection port mismatch: %d/%d' %
-                                 (port, connection_port))
-    location_parts.append(host)
-    if (port != get_default_port(request.is_https())):
-        location_parts.append(':')
-        location_parts.append(str(port))
-    location_parts.append(request.unparsed_uri)
-    return ''.join(location_parts)
-
-
-class Handshaker(object):
-    """Opening handshake processor for the WebSocket protocol version HyBi 00.
-    """
-
-    def __init__(self, request, dispatcher):
-        """Construct an instance.
-
-        Args:
-            request: mod_python request.
-            dispatcher: Dispatcher (dispatch.Dispatcher).
-
-        Handshaker will add attributes such as ws_resource in performing
-        handshake.
-        """
-
-        self._logger = util.get_class_logger(self)
-
-        self._request = request
-        self._dispatcher = dispatcher
-
-    def do_handshake(self):
-        """Perform WebSocket Handshake.
-
-        On _request, we set
-            ws_resource, ws_protocol, ws_location, ws_origin, ws_challenge,
-            ws_challenge_md5: WebSocket handshake information.
-            ws_stream: Frame generation/parsing class.
-            ws_version: Protocol version.
-
-        Raises:
-            HandshakeException: when any error happened in parsing the opening
-                                handshake request.
-        """
-
-        # 5.1 Reading the client's opening handshake.
-        # dispatcher sets it in self._request.
-        _check_header_lines(self._request, _MANDATORY_HEADERS)
-        self._set_resource()
-        self._set_subprotocol()
-        self._set_location()
-        self._set_origin()
-        self._set_challenge_response()
-        self._set_protocol_version()
-
-        self._dispatcher.do_extra_handshake(self._request)
-
-        self._send_handshake()
-
-    def _set_resource(self):
-        self._request.ws_resource = self._request.uri
-
-    def _set_subprotocol(self):
-        # |Sec-WebSocket-Protocol|
-        subprotocol = self._request.headers_in.get(
-            common.SEC_WEBSOCKET_PROTOCOL_HEADER)
-        if subprotocol is not None:
-            _validate_subprotocol(subprotocol)
-        self._request.ws_protocol = subprotocol
-
-    def _set_location(self):
-        # |Host|
-        host = self._request.headers_in.get(common.HOST_HEADER)
-        if host is not None:
-            self._request.ws_location = _build_location(self._request)
-        # TODO(ukai): check host is this host.
-
-    def _set_origin(self):
-        # |Origin|
-        origin = self._request.headers_in.get(common.ORIGIN_HEADER)
-        if origin is not None:
-            self._request.ws_origin = origin
-
-    def _set_protocol_version(self):
-        # |Sec-WebSocket-Draft|
-        draft = self._request.headers_in.get(common.SEC_WEBSOCKET_DRAFT_HEADER)
-        if draft is not None and draft != '0':
-            raise HandshakeException('Illegal value for %s: %s' %
-                                     (common.SEC_WEBSOCKET_DRAFT_HEADER,
-                                      draft))
-
-        self._logger.debug('Protocol version is HyBi 00')
-        self._request.ws_version = common.VERSION_HYBI00
-        self._request.ws_stream = StreamHixie75(self._request, True)
-
-    def _set_challenge_response(self):
-        # 5.2 4-8.
-        self._request.ws_challenge = self._get_challenge()
-        # 5.2 9. let /response/ be the MD5 finterprint of /challenge/
-        self._request.ws_challenge_md5 = util.md5_hash(
-            self._request.ws_challenge).digest()
-        self._logger.debug(
-            'Challenge: %r (%s)',
-            self._request.ws_challenge,
-            util.hexify(self._request.ws_challenge))
-        self._logger.debug(
-            'Challenge response: %r (%s)',
-            self._request.ws_challenge_md5,
-            util.hexify(self._request.ws_challenge_md5))
-
-    def _get_key_value(self, key_field):
-        key_value = get_mandatory_header(self._request, key_field)
-
-        self._logger.debug('%s: %r', key_field, key_value)
-
-        # 5.2 4. let /key-number_n/ be the digits (characters in the range
-        # U+0030 DIGIT ZERO (0) to U+0039 DIGIT NINE (9)) in /key_n/,
-        # interpreted as a base ten integer, ignoring all other characters
-        # in /key_n/.
-        try:
-            key_number = int(re.sub("\\D", "", key_value))
-        except:
-            raise HandshakeException('%s field contains no digit' % key_field)
-        # 5.2 5. let /spaces_n/ be the number of U+0020 SPACE characters
-        # in /key_n/.
-        spaces = re.subn(" ", "", key_value)[1]
-        if spaces == 0:
-            raise HandshakeException('%s field contains no space' % key_field)
-
-        self._logger.debug(
-            '%s: Key-number is %d and number of spaces is %d',
-            key_field, key_number, spaces)
-
-        # 5.2 6. if /key-number_n/ is not an integral multiple of /spaces_n/
-        # then abort the WebSocket connection.
-        if key_number % spaces != 0:
-            raise HandshakeException(
-                '%s: Key-number (%d) is not an integral multiple of spaces '
-                '(%d)' % (key_field, key_number, spaces))
-        # 5.2 7. let /part_n/ be /key-number_n/ divided by /spaces_n/.
-        part = key_number / spaces
-        self._logger.debug('%s: Part is %d', key_field, part)
-        return part
-
-    def _get_challenge(self):
-        # 5.2 4-7.
-        key1 = self._get_key_value(common.SEC_WEBSOCKET_KEY1_HEADER)
-        key2 = self._get_key_value(common.SEC_WEBSOCKET_KEY2_HEADER)
-        # 5.2 8. let /challenge/ be the concatenation of /part_1/,
-        challenge = ''
-        challenge += struct.pack('!I', key1)  # network byteorder int
-        challenge += struct.pack('!I', key2)  # network byteorder int
-        challenge += self._request.connection.read(8)
-        return challenge
-
-    def _send_handshake(self):
-        response = []
-
-        # 5.2 10. send the following line.
-        response.append('HTTP/1.1 101 WebSocket Protocol Handshake\r\n')
-
-        # 5.2 11. send the following fields to the client.
-        response.append(format_header(
-            common.UPGRADE_HEADER, common.WEBSOCKET_UPGRADE_TYPE_HIXIE75))
-        response.append(format_header(
-            common.CONNECTION_HEADER, common.UPGRADE_CONNECTION_TYPE))
-        response.append(format_header(
-            common.SEC_WEBSOCKET_LOCATION_HEADER, self._request.ws_location))
-        response.append(format_header(
-            common.SEC_WEBSOCKET_ORIGIN_HEADER, self._request.ws_origin))
-        if self._request.ws_protocol:
-            response.append(format_header(
-                common.SEC_WEBSOCKET_PROTOCOL_HEADER,
-                self._request.ws_protocol))
-        # 5.2 12. send two bytes 0x0D 0x0A.
-        response.append('\r\n')
-        # 5.2 13. send /response/
-        response.append(self._request.ws_challenge_md5)
-
-        raw_response = ''.join(response)
-        self._request.connection.write(raw_response)
-        self._logger.debug('Sent server\'s opening handshake: %r',
-                           raw_response)
-
-
-# vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/headerparserhandler.py b/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/headerparserhandler.py
deleted file mode 100644
index 06e76385979..00000000000
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/headerparserhandler.py
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 2011, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-"""PythonHeaderParserHandler for mod_pywebsocket.
-
-Apache HTTP Server and mod_python must be configured such that this
-function is called to handle WebSocket request.
-"""
-
-
-import logging
-
-from mod_python import apache
-
-from mod_pywebsocket import common
-from mod_pywebsocket import dispatch
-from mod_pywebsocket import handshake
-from mod_pywebsocket import util
-
-
-# PythonOption to specify the handler root directory.
-_PYOPT_HANDLER_ROOT = 'mod_pywebsocket.handler_root'
-
-# PythonOption to specify the handler scan directory.
-# This must be a directory under the root directory.
-# The default is the root directory.
-_PYOPT_HANDLER_SCAN = 'mod_pywebsocket.handler_scan'
-
-# PythonOption to allow handlers whose canonical path is
-# not under the root directory. It's disallowed by default.
-# Set this option with value of 'yes' to allow.
-_PYOPT_ALLOW_HANDLERS_OUTSIDE_ROOT = (
-    'mod_pywebsocket.allow_handlers_outside_root_dir')
-# Map from values to their meanings. 'Yes' and 'No' are allowed just for
-# compatibility.
-_PYOPT_ALLOW_HANDLERS_OUTSIDE_ROOT_DEFINITION = {
-    'off': False, 'no': False, 'on': True, 'yes': True}
-
-# (Obsolete option. Ignored.)
-# PythonOption to specify to allow handshake defined in Hixie 75 version
-# protocol. The default is None (Off)
-_PYOPT_ALLOW_DRAFT75 = 'mod_pywebsocket.allow_draft75'
-# Map from values to their meanings.
-_PYOPT_ALLOW_DRAFT75_DEFINITION = {'off': False, 'on': True}
-
-
-class ApacheLogHandler(logging.Handler):
-
-    """Wrapper logging.Handler to emit log message to apache's error.log."""
-
-    _LEVELS = {
-        logging.DEBUG: apache.APLOG_DEBUG,
-        logging.INFO: apache.APLOG_INFO,
-        logging.WARNING: apache.APLOG_WARNING,
-        logging.ERROR: apache.APLOG_ERR,
-        logging.CRITICAL: apache.APLOG_CRIT,
-        }
-
-    def __init__(self, request=None):
-        logging.Handler.__init__(self)
-        self._log_error = apache.log_error
-        if request is not None:
-            self._log_error = request.log_error
-
-        # Time and level will be printed by Apache.
-        self._formatter = logging.Formatter('%(name)s: %(message)s')
-
-    def emit(self, record):
-        apache_level = apache.APLOG_DEBUG
-        if record.levelno in ApacheLogHandler._LEVELS:
-            apache_level = ApacheLogHandler._LEVELS[record.levelno]
-
-        msg = self._formatter.format(record)
-
-        # "server" parameter must be passed to have "level" parameter work.
-        # If only "level" parameter is passed, nothing shows up on Apache's
-        # log. However, at this point, we cannot get the server object of the
-        # virtual host which will process WebSocket requests. The only server
-        # object we can get here is apache.main_server. But Wherever (server
-        # configuration context or virtual host context) we put
-        # PythonHeaderParserHandler directive, apache.main_server just points
-        # the main server instance (not any of virtual server instance). Then,
-        # Apache follows LogLevel directive in the server configuration context
-        # to filter logs. So, we need to specify LogLevel in the server
-        # configuration context. Even if we specify "LogLevel debug" in the
-        # virtual host context which actually handles WebSocket connections,
-        # DEBUG level logs never show up unless "LogLevel debug" is specified
-        # in the server configuration context.
-        #
-        # TODO(tyoshino): Provide logging methods on request object. When
-        # request is mp_request object (when used together with Apache), the
-        # methods call request.log_error indirectly. When request is
-        # _StandaloneRequest, the methods call Python's logging facility which
-        # we create in standalone.py.
-        self._log_error(msg, apache_level, apache.main_server)
-
-
-def _configure_logging():
-    logger = logging.getLogger()
-    # Logs are filtered by Apache based on LogLevel directive in Apache
-    # configuration file. We must just pass logs for all levels to
-    # ApacheLogHandler.
-    logger.setLevel(logging.DEBUG)
-    logger.addHandler(ApacheLogHandler())
-
-
-_configure_logging()
-
-_LOGGER = logging.getLogger(__name__)
-
-
-def _parse_option(name, value, definition):
-    """Return the meaning of a option value."""
-    if value is None:
-        return False
-
-    meaning = definition.get(value.lower())
-    if meaning is None:
-        raise Exception('Invalid value for PythonOption %s: %r' %
-                        (name, value))
-    return meaning
-
-
-def _create_dispatcher():
-    """Initialize a dispatch.Dispatcher."""
-    _LOGGER.info('Initializing Dispatcher')
-
-    options = apache.main_server.get_options()
-
-    handler_root = options.get(_PYOPT_HANDLER_ROOT, None)
-    if not handler_root:
-        raise Exception('PythonOption %s is not defined' % _PYOPT_HANDLER_ROOT,
-                        apache.APLOG_ERR)
-
-    handler_scan = options.get(_PYOPT_HANDLER_SCAN, handler_root)
-
-    allow_handlers_outside_root = _parse_option(
-        _PYOPT_ALLOW_HANDLERS_OUTSIDE_ROOT,
-        options.get(_PYOPT_ALLOW_HANDLERS_OUTSIDE_ROOT),
-        _PYOPT_ALLOW_HANDLERS_OUTSIDE_ROOT_DEFINITION)
-
-    dispatcher = dispatch.Dispatcher(
-        handler_root, handler_scan, allow_handlers_outside_root)
-
-    for warning in dispatcher.source_warnings():
-        apache.log_error(
-            'mod_pywebsocket: Warning in source loading: %s' % warning,
-            apache.APLOG_WARNING)
-
-    return dispatcher
-
-
-# Initialize
-_dispatcher = _create_dispatcher()
-
-
-def headerparserhandler(request):
-    """Handle request.
-
-    Args:
-        request: mod_python request.
-
-    This function is named headerparserhandler because it is the default
-    name for a PythonHeaderParserHandler.
-    """
-    handshake_is_done = False
-    try:
-        # Fallback to default http handler for request paths for which
-        # we don't have request handlers.
-        if not _dispatcher.get_handler_suite(request.uri):
-            request.log_error(
-                'mod_pywebsocket: No handler for resource: %r' % request.uri,
-                apache.APLOG_INFO)
-            request.log_error(
-                'mod_pywebsocket: Fallback to Apache', apache.APLOG_INFO)
-            return apache.DECLINED
-    except dispatch.DispatchException as e:
-        request.log_error(
-            'mod_pywebsocket: Dispatch failed for error: %s' % e,
-            apache.APLOG_INFO)
-        if not handshake_is_done:
-            return e.status
-
-    try:
-        allow_draft75 = _parse_option(
-            _PYOPT_ALLOW_DRAFT75,
-            apache.main_server.get_options().get(_PYOPT_ALLOW_DRAFT75),
-            _PYOPT_ALLOW_DRAFT75_DEFINITION)
-
-        try:
-            handshake.do_handshake(
-                request, _dispatcher, allowDraft75=allow_draft75)
-        except handshake.VersionException as e:
-            request.log_error(
-                'mod_pywebsocket: Handshake failed for version error: %s' % e,
-                apache.APLOG_INFO)
-            request.err_headers_out.add(common.SEC_WEBSOCKET_VERSION_HEADER,
-                                        e.supported_versions)
-            return apache.HTTP_BAD_REQUEST
-        except handshake.HandshakeException as e:
-            # Handshake for ws/wss failed.
-            # Send http response with error status.
-            request.log_error(
-                'mod_pywebsocket: Handshake failed for error: %s' % e,
-                apache.APLOG_INFO)
-            return e.status
-
-        handshake_is_done = True
-        request._dispatcher = _dispatcher
-        _dispatcher.transfer_data(request)
-    except handshake.AbortedByUserException as e:
-        request.log_error('mod_pywebsocket: Aborted: %s' % e,
-                          apache.APLOG_INFO)
-    except Exception as e:
-        # DispatchException can also be thrown if something is wrong in
-        # pywebsocket code. It's caught here, then.
-
-        request.log_error('mod_pywebsocket: Exception occurred: %s\n%s' %
-                          (e, util.get_stack_trace()),
-                          apache.APLOG_ERR)
-        # Unknown exceptions before handshake mean Apache must handle its
-        # request with another handler.
-        if not handshake_is_done:
-            return apache.DECLINED
-    # Set assbackwards to suppress response header generation by Apache.
-    request.assbackwards = 1
-    return apache.DONE  # Return DONE such that no other handlers are invoked.
-
-
-# vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/mux.py b/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/mux.py
deleted file mode 100644
index 994f8a14645..00000000000
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/mux.py
+++ /dev/null
@@ -1,1885 +0,0 @@
-# Copyright 2012, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-"""This file provides classes and helper functions for multiplexing extension.
-
-Specification:
-http://tools.ietf.org/html/draft-ietf-hybi-websocket-multiplexing-06
-"""
-
-
-import collections
-import copy
-import email
-import email.parser
-import logging
-import math
-import struct
-import threading
-import traceback
-
-from mod_pywebsocket import common
-from mod_pywebsocket import handshake
-from mod_pywebsocket import util
-from mod_pywebsocket._stream_base import BadOperationException
-from mod_pywebsocket._stream_base import ConnectionTerminatedException
-from mod_pywebsocket._stream_base import InvalidFrameException
-from mod_pywebsocket._stream_hybi import Frame
-from mod_pywebsocket._stream_hybi import Stream
-from mod_pywebsocket._stream_hybi import StreamOptions
-from mod_pywebsocket._stream_hybi import create_binary_frame
-from mod_pywebsocket._stream_hybi import create_closing_handshake_body
-from mod_pywebsocket._stream_hybi import create_header
-from mod_pywebsocket._stream_hybi import create_length_header
-from mod_pywebsocket._stream_hybi import parse_frame
-from mod_pywebsocket.handshake import hybi
-
-
-_CONTROL_CHANNEL_ID = 0
-_DEFAULT_CHANNEL_ID = 1
-
-_MUX_OPCODE_ADD_CHANNEL_REQUEST = 0
-_MUX_OPCODE_ADD_CHANNEL_RESPONSE = 1
-_MUX_OPCODE_FLOW_CONTROL = 2
-_MUX_OPCODE_DROP_CHANNEL = 3
-_MUX_OPCODE_NEW_CHANNEL_SLOT = 4
-
-_MAX_CHANNEL_ID = 2 ** 29 - 1
-
-_INITIAL_NUMBER_OF_CHANNEL_SLOTS = 64
-_INITIAL_QUOTA_FOR_CLIENT = 8 * 1024
-
-_HANDSHAKE_ENCODING_IDENTITY = 0
-_HANDSHAKE_ENCODING_DELTA = 1
-
-# We need only these status code for now.
-_HTTP_BAD_RESPONSE_MESSAGES = {
-    common.HTTP_STATUS_BAD_REQUEST: 'Bad Request',
-}
-
-# DropChannel reason code
-# TODO(bashi): Define all reason code defined in -05 draft.
-_DROP_CODE_NORMAL_CLOSURE = 1000
-
-_DROP_CODE_INVALID_ENCAPSULATING_MESSAGE = 2001
-_DROP_CODE_CHANNEL_ID_TRUNCATED = 2002
-_DROP_CODE_ENCAPSULATED_FRAME_IS_TRUNCATED = 2003
-_DROP_CODE_UNKNOWN_MUX_OPCODE = 2004
-_DROP_CODE_INVALID_MUX_CONTROL_BLOCK = 2005
-_DROP_CODE_CHANNEL_ALREADY_EXISTS = 2006
-_DROP_CODE_NEW_CHANNEL_SLOT_VIOLATION = 2007
-_DROP_CODE_UNKNOWN_REQUEST_ENCODING = 2010
-
-_DROP_CODE_SEND_QUOTA_VIOLATION = 3005
-_DROP_CODE_SEND_QUOTA_OVERFLOW = 3006
-_DROP_CODE_ACKNOWLEDGED = 3008
-_DROP_CODE_BAD_FRAGMENTATION = 3009
-
-
-class MuxUnexpectedException(Exception):
-
-    """Exception in handling multiplexing extension."""
-
-    pass
-
-
-# Temporary
-class MuxNotImplementedException(Exception):
-
-    """Raised when a flow enters unimplemented code path."""
-
-    pass
-
-
-class LogicalConnectionClosedException(Exception):
-
-    """Raised when logical connection is gracefully closed."""
-
-    pass
-
-
-class PhysicalConnectionError(Exception):
-
-    """Raised when there is a physical connection error."""
-
-    def __init__(self, drop_code, message=''):
-        super(PhysicalConnectionError, self).__init__(
-            'code=%d, message=%r' % (drop_code, message))
-        self.drop_code = drop_code
-        self.message = message
-
-
-class LogicalChannelError(Exception):
-
-    """Raised when there is a logical channel error."""
-
-    def __init__(self, channel_id, drop_code, message=''):
-        """Initialize the error with a status message."""
-        super(LogicalChannelError, self).__init__(
-            'channel_id=%d, code=%d, message=%r' % (
-                channel_id, drop_code, message))
-        self.channel_id = channel_id
-        self.drop_code = drop_code
-        self.message = message
-
-
-def _encode_channel_id(channel_id):
-    if channel_id < 0:
-        raise ValueError('Channel id %d must not be negative' % channel_id)
-
-    if channel_id < 2 ** 7:
-        return chr(channel_id)
-    if channel_id < 2 ** 14:
-        return struct.pack('!H', 0x8000 + channel_id)
-    if channel_id < 2 ** 21:
-        first = chr(0xc0 + (channel_id >> 16))
-        return first + struct.pack('!H', channel_id & 0xffff)
-    if channel_id < 2 ** 29:
-        return struct.pack('!L', 0xe0000000 + channel_id)
-
-    raise ValueError('Channel id %d is too large' % channel_id)
-
-
-def _encode_number(number):
-    return create_length_header(number, False)
-
-
-def _create_add_channel_response(channel_id, encoded_handshake,
-                                 encoding=0, rejected=False):
-    if encoding != 0 and encoding != 1:
-        raise ValueError('Invalid encoding %d' % encoding)
-
-    first_byte = ((_MUX_OPCODE_ADD_CHANNEL_RESPONSE << 5) |
-                  (rejected << 4) | encoding)
-    block = (chr(first_byte) +
-             _encode_channel_id(channel_id) +
-             _encode_number(len(encoded_handshake)) +
-             encoded_handshake)
-    return block
-
-
-def _create_drop_channel(channel_id, code=None, message=''):
-    if len(message) > 0 and code is None:
-        raise ValueError('Code must be specified if message is specified')
-
-    first_byte = _MUX_OPCODE_DROP_CHANNEL << 5
-    block = chr(first_byte) + _encode_channel_id(channel_id)
-    if code is None:
-        block += _encode_number(0)  # Reason size
-    else:
-        reason = struct.pack('!H', code) + message
-        reason_size = _encode_number(len(reason))
-        block += reason_size + reason
-
-    return block
-
-
-def _create_flow_control(channel_id, replenished_quota):
-    first_byte = _MUX_OPCODE_FLOW_CONTROL << 5
-    block = (chr(first_byte) +
-             _encode_channel_id(channel_id) +
-             _encode_number(replenished_quota))
-    return block
-
-
-def _create_new_channel_slot(slots, send_quota):
-    if slots < 0 or send_quota < 0:
-        raise ValueError('slots and send_quota must be non-negative.')
-    first_byte = _MUX_OPCODE_NEW_CHANNEL_SLOT << 5
-    block = (chr(first_byte) +
-             _encode_number(slots) +
-             _encode_number(send_quota))
-    return block
-
-
-def _create_fallback_new_channel_slot():
-    first_byte = (_MUX_OPCODE_NEW_CHANNEL_SLOT << 5) | 1  # Set the F flag
-    block = (chr(first_byte) + _encode_number(0) + _encode_number(0))
-    return block
-
-
-def _parse_request_text(request_text):
-    request_line, header_lines = request_text.split('\r\n', 1)
-
-    words = request_line.split(' ')
-    if len(words) != 3:
-        raise ValueError('Bad Request-Line syntax %r' % request_line)
-    [command, path, version] = words
-    if version != 'HTTP/1.1':
-        raise ValueError('Bad request version %r' % version)
-
-    # email.parser.Parser() parses RFC 2822 (RFC 822) style headers.
-    # RFC 6455 refers RFC 2616 for handshake parsing, and RFC 2616 refers
-    # RFC 822.
-    headers = email.parser.Parser().parsestr(header_lines)
-    return command, path, version, headers
-
-
-class _ControlBlock(object):
-
-    """A structure that holds parsing result of multiplexing control block.
-
-    Control block specific attributes will be added by _MuxFramePayloadParser.
-    (e.g. encoded_handshake will be added for AddChannelRequest and
-    AddChannelResponse)
-    """
-
-    def __init__(self, opcode):
-        self.opcode = opcode
-
-
-class _MuxFramePayloadParser(object):
-
-    """A class that parses multiplexed frame payload."""
-
-    def __init__(self, payload):
-        self._data = payload
-        self._read_position = 0
-        self._logger = util.get_class_logger(self)
-
-    def read_channel_id(self):
-        """Read channel id.
-
-        Raises:
-            ValueError: when the payload doesn't contain
-                valid channel id.
-        """
-        remaining_length = len(self._data) - self._read_position
-        pos = self._read_position
-        if remaining_length == 0:
-            raise ValueError('Invalid channel id format')
-
-        channel_id = ord(self._data[pos])
-        channel_id_length = 1
-        if channel_id & 0xe0 == 0xe0:
-            if remaining_length < 4:
-                raise ValueError('Invalid channel id format')
-            channel_id = struct.unpack('!L',
-                                       self._data[pos:pos+4])[0] & 0x1fffffff
-            channel_id_length = 4
-        elif channel_id & 0xc0 == 0xc0:
-            if remaining_length < 3:
-                raise ValueError('Invalid channel id format')
-            channel_id = (((channel_id & 0x1f) << 16) +
-                          struct.unpack('!H', self._data[pos+1:pos+3])[0])
-            channel_id_length = 3
-        elif channel_id & 0x80 == 0x80:
-            if remaining_length < 2:
-                raise ValueError('Invalid channel id format')
-            channel_id = struct.unpack('!H',
-                                       self._data[pos:pos+2])[0] & 0x3fff
-            channel_id_length = 2
-        self._read_position += channel_id_length
-
-        return channel_id
-
-    def read_inner_frame(self):
-        """Read an inner frame.
-
-        Raises:
-            PhysicalConnectionError: when the inner frame is invalid.
-        """
-        if len(self._data) == self._read_position:
-            raise PhysicalConnectionError(
-                _DROP_CODE_ENCAPSULATED_FRAME_IS_TRUNCATED)
-
-        bits = ord(self._data[self._read_position])
-        self._read_position += 1
-        fin = (bits & 0x80) == 0x80
-        rsv1 = (bits & 0x40) == 0x40
-        rsv2 = (bits & 0x20) == 0x20
-        rsv3 = (bits & 0x10) == 0x10
-        opcode = bits & 0xf
-        payload = self.remaining_data()
-        # Consume rest of the message which is payload data of the original
-        # frame.
-        self._read_position = len(self._data)
-        return fin, rsv1, rsv2, rsv3, opcode, payload
-
-    def _read_number(self):
-        if self._read_position + 1 > len(self._data):
-            raise ValueError(
-                'Cannot read the first byte of number field')
-
-        number = ord(self._data[self._read_position])
-        if number & 0x80 == 0x80:
-            raise ValueError(
-                'The most significant bit of the first byte of number should '
-                'be unset')
-        self._read_position += 1
-        pos = self._read_position
-        if number == 127:
-            if pos + 8 > len(self._data):
-                raise ValueError('Invalid number field')
-            self._read_position += 8
-            number = struct.unpack('!Q', self._data[pos:pos+8])[0]
-            if number > 0x7FFFFFFFFFFFFFFF:
-                raise ValueError('Encoded number(%d) >= 2^63' % number)
-            if number <= 0xFFFF:
-                raise ValueError(
-                    '%d should not be encoded by 9 bytes encoding' % number)
-            return number
-        if number == 126:
-            if pos + 2 > len(self._data):
-                raise ValueError('Invalid number field')
-            self._read_position += 2
-            number = struct.unpack('!H', self._data[pos:pos+2])[0]
-            if number <= 125:
-                raise ValueError(
-                    '%d should not be encoded by 3 bytes encoding' % number)
-        return number
-
-    def _read_size_and_contents(self):
-        """Read data that consists of the following:
-            - the size of the contents encoded the same way as payload length
-              of the WebSocket Protocol with 1 bit padding at the head.
-            - the contents.
-        """
-        try:
-            size = self._read_number()
-        except ValueError as e:
-            raise PhysicalConnectionError(_DROP_CODE_INVALID_MUX_CONTROL_BLOCK,
-                                          str(e))
-        pos = self._read_position
-        if pos + size > len(self._data):
-            raise PhysicalConnectionError(
-                _DROP_CODE_INVALID_MUX_CONTROL_BLOCK,
-                'Cannot read %d bytes data' % size)
-
-        self._read_position += size
-        return self._data[pos:pos+size]
-
-    def _read_add_channel_request(self, first_byte, control_block):
-        reserved = (first_byte >> 2) & 0x7
-        if reserved != 0:
-            raise PhysicalConnectionError(
-                _DROP_CODE_INVALID_MUX_CONTROL_BLOCK,
-                'Reserved bits must be unset')
-
-        # Invalid encoding will be handled by MuxHandler.
-        encoding = first_byte & 0x3
-        try:
-            control_block.channel_id = self.read_channel_id()
-        except ValueError as e:
-            raise PhysicalConnectionError(_DROP_CODE_INVALID_MUX_CONTROL_BLOCK)
-        control_block.encoding = encoding
-        encoded_handshake = self._read_size_and_contents()
-        control_block.encoded_handshake = encoded_handshake
-        return control_block
-
-    def _read_add_channel_response(self, first_byte, control_block):
-        reserved = (first_byte >> 2) & 0x3
-        if reserved != 0:
-            raise PhysicalConnectionError(
-                _DROP_CODE_INVALID_MUX_CONTROL_BLOCK,
-                'Reserved bits must be unset')
-
-        control_block.accepted = (first_byte >> 4) & 1
-        control_block.encoding = first_byte & 0x3
-        try:
-            control_block.channel_id = self.read_channel_id()
-        except ValueError as e:
-            raise PhysicalConnectionError(_DROP_CODE_INVALID_MUX_CONTROL_BLOCK)
-        control_block.encoded_handshake = self._read_size_and_contents()
-        return control_block
-
-    def _read_flow_control(self, first_byte, control_block):
-        reserved = first_byte & 0x1f
-        if reserved != 0:
-            raise PhysicalConnectionError(
-                _DROP_CODE_INVALID_MUX_CONTROL_BLOCK,
-                'Reserved bits must be unset')
-
-        try:
-            control_block.channel_id = self.read_channel_id()
-            control_block.send_quota = self._read_number()
-        except ValueError as e:
-            raise PhysicalConnectionError(_DROP_CODE_INVALID_MUX_CONTROL_BLOCK,
-                                          str(e))
-
-        return control_block
-
-    def _read_drop_channel(self, first_byte, control_block):
-        reserved = first_byte & 0x1f
-        if reserved != 0:
-            raise PhysicalConnectionError(
-                _DROP_CODE_INVALID_MUX_CONTROL_BLOCK,
-                'Reserved bits must be unset')
-
-        try:
-            control_block.channel_id = self.read_channel_id()
-        except ValueError as e:
-            raise PhysicalConnectionError(_DROP_CODE_INVALID_MUX_CONTROL_BLOCK)
-        reason = self._read_size_and_contents()
-        if len(reason) == 0:
-            control_block.drop_code = None
-            control_block.drop_message = ''
-        elif len(reason) >= 2:
-            control_block.drop_code = struct.unpack('!H', reason[:2])[0]
-            control_block.drop_message = reason[2:]
-        else:
-            raise PhysicalConnectionError(
-                _DROP_CODE_INVALID_MUX_CONTROL_BLOCK,
-                'Received DropChannel that conains only 1-byte reason')
-        return control_block
-
-    def _read_new_channel_slot(self, first_byte, control_block):
-        reserved = first_byte & 0x1e
-        if reserved != 0:
-            raise PhysicalConnectionError(
-                _DROP_CODE_INVALID_MUX_CONTROL_BLOCK,
-                'Reserved bits must be unset')
-        control_block.fallback = first_byte & 1
-        try:
-            control_block.slots = self._read_number()
-            control_block.send_quota = self._read_number()
-        except ValueError as e:
-            raise PhysicalConnectionError(_DROP_CODE_INVALID_MUX_CONTROL_BLOCK,
-                                          str(e))
-        return control_block
-
-    def read_control_blocks(self):
-        """Read control block(s).
-
-        Raises:
-           PhysicalConnectionError: when the payload contains invalid control
-               block(s).
-           StopIteration: when no control blocks left.
-        """
-        while self._read_position < len(self._data):
-            first_byte = ord(self._data[self._read_position])
-            self._read_position += 1
-            opcode = (first_byte >> 5) & 0x7
-            control_block = _ControlBlock(opcode=opcode)
-            if opcode == _MUX_OPCODE_ADD_CHANNEL_REQUEST:
-                yield self._read_add_channel_request(first_byte, control_block)
-            elif opcode == _MUX_OPCODE_ADD_CHANNEL_RESPONSE:
-                yield self._read_add_channel_response(
-                    first_byte, control_block)
-            elif opcode == _MUX_OPCODE_FLOW_CONTROL:
-                yield self._read_flow_control(first_byte, control_block)
-            elif opcode == _MUX_OPCODE_DROP_CHANNEL:
-                yield self._read_drop_channel(first_byte, control_block)
-            elif opcode == _MUX_OPCODE_NEW_CHANNEL_SLOT:
-                yield self._read_new_channel_slot(first_byte, control_block)
-            else:
-                raise PhysicalConnectionError(
-                    _DROP_CODE_UNKNOWN_MUX_OPCODE,
-                    'Invalid opcode %d' % opcode)
-
-        assert self._read_position == len(self._data)
-        raise StopIteration
-
-    def remaining_data(self):
-        """Return remaining data."""
-        return self._data[self._read_position:]
-
-
-class _LogicalRequest(object):
-
-    """Mimics mod_python request."""
-
-    def __init__(self, channel_id, command, path, protocol, headers,
-                 connection):
-        """Construct an instance.
-
-        Args:
-            channel_id: the channel id of the logical channel.
-            command: HTTP request command.
-            path: HTTP request path.
-            headers: HTTP headers.
-            connection: _LogicalConnection instance.
-        """
-        self.channel_id = channel_id
-        self.method = command
-        self.uri = path
-        self.protocol = protocol
-        self.headers_in = headers
-        self.connection = connection
-        self.server_terminated = False
-        self.client_terminated = False
-
-    def is_https(self):
-        """Mimic request.is_https().
-
-        Returns False because this method is used only by old protocols
-        (hixie and hybi00).
-        """
-        return False
-
-
-class _LogicalConnection(object):
-
-    """Mimics mod_python mp_conn."""
-
-    # For details, see the comment of set_read_state().
-    STATE_ACTIVE = 1
-    STATE_GRACEFULLY_CLOSED = 2
-    STATE_TERMINATED = 3
-
-    def __init__(self, mux_handler, channel_id):
-        """Construct an instance.
-
-        Args:
-            mux_handler: _MuxHandler instance.
-            channel_id: channel id of this connection.
-        """
-        self._mux_handler = mux_handler
-        self._channel_id = channel_id
-        self._incoming_data = ''
-
-        # - Protects _waiting_write_completion
-        # - Signals the thread waiting for completion of write by mux handler
-        self._write_condition = threading.Condition()
-        self._waiting_write_completion = False
-
-        self._read_condition = threading.Condition()
-        self._read_state = self.STATE_ACTIVE
-
-    def get_local_addr(self):
-        """Getter to mimic mp_conn.local_addr."""
-        return self._mux_handler.physical_connection.get_local_addr()
-    local_addr = property(get_local_addr)
-
-    def get_remote_addr(self):
-        """Getter to mimic mp_conn.remote_addr."""
-        return self._mux_handler.physical_connection.get_remote_addr()
-    remote_addr = property(get_remote_addr)
-
-    def get_memorized_lines(self):
-        """Get memorized lines. Not supported."""
-        raise MuxUnexpectedException('_LogicalConnection does not support '
-                                     'get_memorized_lines')
-
-    def write(self, data):
-        """Write data. mux_handler sends data asynchronously.
-
-        The caller will be suspended until write done.
-
-        Args:
-            data: data to be written.
-
-        Raises:
-            MuxUnexpectedException: when called before finishing the previous
-                write.
-        """
-        try:
-            self._write_condition.acquire()
-            if self._waiting_write_completion:
-                raise MuxUnexpectedException(
-                    'Logical connection %d is already waiting the completion '
-                    'of write' % self._channel_id)
-
-            self._waiting_write_completion = True
-            self._mux_handler.send_data(self._channel_id, data)
-            self._write_condition.wait()
-            # TODO(tyoshino): Raise an exception if woke up by on_writer_done.
-        finally:
-            self._write_condition.release()
-
-    def write_control_data(self, data):
-        """Write data via the control channel.
-
-        Don't wait finishing write because this method can be called by
-        mux dispatcher.
-
-        Args:
-            data: data to be written.
-        """
-        self._mux_handler.send_control_data(data)
-
-    def on_write_data_done(self):
-        """Called when sending data is completed."""
-        try:
-            self._write_condition.acquire()
-            if not self._waiting_write_completion:
-                raise MuxUnexpectedException(
-                    'Invalid call of on_write_data_done for logical '
-                    'connection %d' % self._channel_id)
-            self._waiting_write_completion = False
-            self._write_condition.notify()
-        finally:
-            self._write_condition.release()
-
-    def on_writer_done(self):
-        """Called by the mux handler when the writer thread has finished."""
-        try:
-            self._write_condition.acquire()
-            self._waiting_write_completion = False
-            self._write_condition.notify()
-        finally:
-            self._write_condition.release()
-
-    def append_frame_data(self, frame_data):
-        """Append incoming frame data.
-
-        Called when mux_handler dispatches frame data to the corresponding
-        application.
-
-        Args:
-            frame_data: incoming frame data.
-        """
-        self._read_condition.acquire()
-        self._incoming_data += frame_data
-        self._read_condition.notify()
-        self._read_condition.release()
-
-    def read(self, length):
-        """Read data.
-
-        Blocks until enough data has arrived via physical connection.
-
-        Args:
-            length: length of data to be read.
-        Raises:
-            LogicalConnectionClosedException: when closing handshake for this
-                logical channel has been received.
-            ConnectionTerminatedException: when the physical connection has
-                closed, or an error is caused on the reader thread.
-        """
-        self._read_condition.acquire()
-        while (self._read_state == self.STATE_ACTIVE and
-               len(self._incoming_data) < length):
-            self._read_condition.wait()
-
-        try:
-            if self._read_state == self.STATE_GRACEFULLY_CLOSED:
-                raise LogicalConnectionClosedException(
-                    'Logical channel %d has closed.' % self._channel_id)
-            elif self._read_state == self.STATE_TERMINATED:
-                raise ConnectionTerminatedException(
-                    'Receiving %d byte failed. Logical channel (%d) closed' %
-                    (length, self._channel_id))
-
-            value = self._incoming_data[:length]
-            self._incoming_data = self._incoming_data[length:]
-        finally:
-            self._read_condition.release()
-
-        return value
-
-    def set_read_state(self, new_state):
-        """Set the state of this connection.
-
-        Called when an event for this connection has occurred.
-        Args:
-            new_state: state to be set. new_state must be one of followings:
-            - STATE_GRACEFULLY_CLOSED: when closing handshake for this
-                connection has been received.
-            - STATE_TERMINATED: when the physical connection has closed or
-                DropChannel of this connection has received.
-        """
-        self._read_condition.acquire()
-        self._read_state = new_state
-        self._read_condition.notify()
-        self._read_condition.release()
-
-
-class _InnerMessage(object):
-
-    """Hold the result of _InnerMessageBuilder.build()."""
-
-    def __init__(self, opcode, payload):
-        self.opcode = opcode
-        self.payload = payload
-
-
-class _InnerMessageBuilder(object):
-
-    """Class to build an _InnerMessage.
-
-    A class that holds the context of inner message fragmentation and
-    builds a message from fragmented inner frame(s).
-    """
-
-    def __init__(self):
-        self._control_opcode = None
-        self._pending_control_fragments = []
-        self._message_opcode = None
-        self._pending_message_fragments = []
-        self._frame_handler = self._handle_first
-
-    def _handle_first(self, frame):
-        if frame.opcode == common.OPCODE_CONTINUATION:
-            raise InvalidFrameException('Sending invalid continuation opcode')
-
-        if common.is_control_opcode(frame.opcode):
-            return self._process_first_fragmented_control(frame)
-        else:
-            return self._process_first_fragmented_message(frame)
-
-    def _process_first_fragmented_control(self, frame):
-        self._control_opcode = frame.opcode
-        self._pending_control_fragments.append(frame.payload)
-        if not frame.fin:
-            self._frame_handler = self._handle_fragmented_control
-            return None
-        return self._reassemble_fragmented_control()
-
-    def _process_first_fragmented_message(self, frame):
-        self._message_opcode = frame.opcode
-        self._pending_message_fragments.append(frame.payload)
-        if not frame.fin:
-            self._frame_handler = self._handle_fragmented_message
-            return None
-        return self._reassemble_fragmented_message()
-
-    def _handle_fragmented_control(self, frame):
-        if frame.opcode != common.OPCODE_CONTINUATION:
-            raise InvalidFrameException(
-                'Sending invalid opcode %d while sending fragmented control '
-                'message' % frame.opcode)
-        self._pending_control_fragments.append(frame.payload)
-        if not frame.fin:
-            return None
-        return self._reassemble_fragmented_control()
-
-    def _reassemble_fragmented_control(self):
-        opcode = self._control_opcode
-        payload = ''.join(self._pending_control_fragments)
-        self._control_opcode = None
-        self._pending_control_fragments = []
-        if self._message_opcode is not None:
-            self._frame_handler = self._handle_fragmented_message
-        else:
-            self._frame_handler = self._handle_first
-        return _InnerMessage(opcode, payload)
-
-    def _handle_fragmented_message(self, frame):
-        # Sender can interleave a control message while sending fragmented
-        # messages.
-        if common.is_control_opcode(frame.opcode):
-            if self._control_opcode is not None:
-                raise MuxUnexpectedException(
-                    'Should not reach here(Bug in builder)')
-            return self._process_first_fragmented_control(frame)
-
-        if frame.opcode != common.OPCODE_CONTINUATION:
-            raise InvalidFrameException(
-                'Sending invalid opcode %d while sending fragmented message' %
-                frame.opcode)
-        self._pending_message_fragments.append(frame.payload)
-        if not frame.fin:
-            return None
-        return self._reassemble_fragmented_message()
-
-    def _reassemble_fragmented_message(self):
-        opcode = self._message_opcode
-        payload = ''.join(self._pending_message_fragments)
-        self._message_opcode = None
-        self._pending_message_fragments = []
-        self._frame_handler = self._handle_first
-        return _InnerMessage(opcode, payload)
-
-    def build(self, frame):
-        """Build an inner message.
-
-        Returns an _InnerMessage instance when the given frame is the last
-        fragmented frame. Returns None otherwise.
-
-        Args:
-            frame: an inner frame.
-        Raises:
-            InvalidFrameException: when received invalid opcode. (e.g.
-                receiving non continuation data opcode but the fin flag of
-                the previous inner frame was not set.)
-        """
-        return self._frame_handler(frame)
-
-
-class _LogicalStream(Stream):
-
-    """Mimics the Stream class.
-
-    This class interprets multiplexed WebSocket frames.
-    """
-
-    def __init__(self, request, stream_options, send_quota, receive_quota):
-        """Construct an instance.
-
-        Args:
-            request: _LogicalRequest instance.
-            stream_options: StreamOptions instance.
-            send_quota: Initial send quota.
-            receive_quota: Initial receive quota.
-        """
-        # Physical stream is responsible for masking.
-        stream_options.unmask_receive = False
-        Stream.__init__(self, request, stream_options)
-
-        self._send_closed = False
-        self._send_quota = send_quota
-        # - Protects _send_closed and _send_quota
-        # - Signals the thread waiting for send quota replenished
-        self._send_condition = threading.Condition()
-
-        # The opcode of the first frame in messages.
-        self._message_opcode = common.OPCODE_TEXT
-        # True when the last message was fragmented.
-        self._last_message_was_fragmented = False
-
-        self._receive_quota = receive_quota
-        self._write_inner_frame_semaphore = threading.Semaphore()
-
-        self._inner_message_builder = _InnerMessageBuilder()
-
-    def _create_inner_frame(self, opcode, payload, end=True):
-        frame = Frame(fin=end, opcode=opcode, payload=payload)
-        for frame_filter in self._options.outgoing_frame_filters:
-            frame_filter.filter(frame)
-
-        if len(payload) != len(frame.payload):
-            raise MuxUnexpectedException(
-                'Mux extension must not be used after extensions which change '
-                ' frame boundary')
-
-        first_byte = ((frame.fin << 7) | (frame.rsv1 << 6) |
-                      (frame.rsv2 << 5) | (frame.rsv3 << 4) | frame.opcode)
-        return chr(first_byte) + frame.payload
-
-    def _write_inner_frame(self, opcode, payload, end=True):
-        payload_length = len(payload)
-        write_position = 0
-
-        try:
-            # An inner frame will be fragmented if there is no enough send
-            # quota. This semaphore ensures that fragmented inner frames are
-            # sent in order on the logical channel.
-            # Note that frames that come from other logical channels or
-            # multiplexing control blocks can be inserted between fragmented
-            # inner frames on the physical channel.
-            self._write_inner_frame_semaphore.acquire()
-
-            # Consume an octet quota when this is the first fragmented frame.
-            if opcode != common.OPCODE_CONTINUATION:
-                try:
-                    self._send_condition.acquire()
-                    while (not self._send_closed) and self._send_quota == 0:
-                        self._send_condition.wait()
-
-                    if self._send_closed:
-                        raise BadOperationException(
-                            'Logical connection %d is closed' %
-                            self._request.channel_id)
-
-                    self._send_quota -= 1
-                finally:
-                    self._send_condition.release()
-
-            while write_position < payload_length:
-                try:
-                    self._send_condition.acquire()
-                    while (not self._send_closed) and self._send_quota == 0:
-                        self._logger.debug(
-                            'No quota. Waiting FlowControl message for %d.' %
-                            self._request.channel_id)
-                        self._send_condition.wait()
-
-                    if self._send_closed:
-                        raise BadOperationException(
-                            'Logical connection %d is closed' %
-                            self.request._channel_id)
-
-                    remaining = payload_length - write_position
-                    write_length = min(self._send_quota, remaining)
-                    inner_frame_end = (
-                        end and
-                        (write_position + write_length == payload_length))
-
-                    inner_frame = self._create_inner_frame(
-                        opcode,
-                        payload[write_position:write_position+write_length],
-                        inner_frame_end)
-                    self._send_quota -= write_length
-                    self._logger.debug('Consumed quota=%d, remaining=%d' %
-                                       (write_length, self._send_quota))
-                finally:
-                    self._send_condition.release()
-
-                # Writing data will block the worker so we need to release
-                # _send_condition before writing.
-                self._logger.debug('Sending inner frame: %r' % inner_frame)
-                self._request.connection.write(inner_frame)
-                write_position += write_length
-
-                opcode = common.OPCODE_CONTINUATION
-
-        except ValueError as e:
-            raise BadOperationException(e)
-        finally:
-            self._write_inner_frame_semaphore.release()
-
-    def replenish_send_quota(self, send_quota):
-        """Replenish send quota."""
-        try:
-            self._send_condition.acquire()
-            if self._send_quota + send_quota > 0x7FFFFFFFFFFFFFFF:
-                self._send_quota = 0
-                raise LogicalChannelError(
-                    self._request.channel_id, _DROP_CODE_SEND_QUOTA_OVERFLOW)
-            self._send_quota += send_quota
-            self._logger.debug('Replenished send quota for channel id %d: %d' %
-                               (self._request.channel_id, self._send_quota))
-        finally:
-            self._send_condition.notify()
-            self._send_condition.release()
-
-    def consume_receive_quota(self, amount):
-        """Consume receive quota. Returns False on failure."""
-        if self._receive_quota < amount:
-            self._logger.debug('Violate quota on channel id %d: %d < %d' %
-                               (self._request.channel_id,
-                                self._receive_quota, amount))
-            return False
-        self._receive_quota -= amount
-        return True
-
-    def send_message(self, message, end=True, binary=False):
-        """Override Stream.send_message."""
-        if self._request.server_terminated:
-            raise BadOperationException(
-                'Requested send_message after sending out a closing handshake')
-
-        if binary and isinstance(message, unicode):
-            raise BadOperationException(
-                'Message for binary frame must be instance of str')
-
-        if binary:
-            opcode = common.OPCODE_BINARY
-        else:
-            opcode = common.OPCODE_TEXT
-            message = message.encode('utf-8')
-
-        for message_filter in self._options.outgoing_message_filters:
-            message = message_filter.filter(message, end, binary)
-
-        if self._last_message_was_fragmented:
-            if opcode != self._message_opcode:
-                raise BadOperationException('Message types are different in '
-                                            'frames for the same message')
-            opcode = common.OPCODE_CONTINUATION
-        else:
-            self._message_opcode = opcode
-
-        self._write_inner_frame(opcode, message, end)
-        self._last_message_was_fragmented = not end
-
-    def _receive_frame(self):
-        """Override Stream._receive_frame.
-
-        In addition to call Stream._receive_frame, this method adds the amount
-        of payload to receiving quota and sends FlowControl to the client.
-        We need to do it here because Stream.receive_message() handles
-        control frames internally.
-        """
-        opcode, payload, fin, rsv1, rsv2, rsv3 = Stream._receive_frame(self)
-        amount = len(payload)
-        # Replenish extra one octet when receiving the first fragmented frame.
-        if opcode != common.OPCODE_CONTINUATION:
-            amount += 1
-        self._receive_quota += amount
-        frame_data = _create_flow_control(self._request.channel_id,
-                                          amount)
-        self._logger.debug('Sending flow control for %d, replenished=%d' %
-                           (self._request.channel_id, amount))
-        self._request.connection.write_control_data(frame_data)
-        return opcode, payload, fin, rsv1, rsv2, rsv3
-
-    def _get_message_from_frame(self, frame):
-        """Override Stream._get_message_from_frame."""
-        try:
-            inner_message = self._inner_message_builder.build(frame)
-        except InvalidFrameException:
-            raise LogicalChannelError(
-                self._request.channel_id, _DROP_CODE_BAD_FRAGMENTATION)
-
-        if inner_message is None:
-            return None
-        self._original_opcode = inner_message.opcode
-        return inner_message.payload
-
-    def receive_message(self):
-        """Override Stream.receive_message."""
-        # Just call Stream.receive_message(), but catch
-        # LogicalConnectionClosedException, which is raised when the logical
-        # connection has closed gracefully.
-        try:
-            return Stream.receive_message(self)
-        except LogicalConnectionClosedException as e:
-            self._logger.debug('%s', e)
-            return None
-
-    def _send_closing_handshake(self, code, reason):
-        """Override Stream._send_closing_handshake."""
-        body = create_closing_handshake_body(code, reason)
-        self._logger.debug('Sending closing handshake for %d: (%r, %r)' %
-                           (self._request.channel_id, code, reason))
-        self._write_inner_frame(common.OPCODE_CLOSE, body, end=True)
-
-        self._request.server_terminated = True
-
-    def send_ping(self, body=''):
-        """Override Stream.send_ping."""
-        self._logger.debug('Sending ping on logical channel %d: %r' %
-                           (self._request.channel_id, body))
-        self._write_inner_frame(common.OPCODE_PING, body, end=True)
-
-        self._ping_queue.append(body)
-
-    def _send_pong(self, body):
-        """Override Stream._send_pong."""
-        self._logger.debug('Sending pong on logical channel %d: %r' %
-                           (self._request.channel_id, body))
-        self._write_inner_frame(common.OPCODE_PONG, body, end=True)
-
-    def close_connection(self, code=common.STATUS_NORMAL_CLOSURE, reason=''):
-        """Override Stream.close_connection."""
-        # TODO(bashi): Implement
-        self._logger.debug('Closing logical connection %d' %
-                           self._request.channel_id)
-        self._request.server_terminated = True
-
-    def stop_sending(self):
-        """Stop accepting new send operation (_write_inner_frame)."""
-        self._send_condition.acquire()
-        self._send_closed = True
-        self._send_condition.notify()
-        self._send_condition.release()
-
-
-class _OutgoingData(object):
-
-    """Simple data/channel container.
-
-    A structure that holds data to be sent via physical connection and
-    origin of the data.
-    """
-
-    def __init__(self, channel_id, data):
-        self.channel_id = channel_id
-        self.data = data
-
-
-class _PhysicalConnectionWriter(threading.Thread):
-
-    """A thread that is responsible for writing data to physical connection.
-
-    TODO(bashi): Make sure there is no thread-safety problem when the reader
-    thread reads data from the same socket at a time.
-    """
-
-    def __init__(self, mux_handler):
-        """Construct an instance.
-
-        Args:
-            mux_handler: _MuxHandler instance.
-        """
-        threading.Thread.__init__(self)
-        self._logger = util.get_class_logger(self)
-        self._mux_handler = mux_handler
-        self.setDaemon(True)
-
-        # When set, make this thread stop accepting new data, flush pending
-        # data and exit.
-        self._stop_requested = False
-        # The close code of the physical connection.
-        self._close_code = common.STATUS_NORMAL_CLOSURE
-        # Deque for passing write data. It's protected by _deque_condition
-        # until _stop_requested is set.
-        self._deque = collections.deque()
-        # - Protects _deque, _stop_requested and _close_code
-        # - Signals threads waiting for them to be available
-        self._deque_condition = threading.Condition()
-
-    def put_outgoing_data(self, data):
-        """Put outgoing data.
-
-        Args:
-            data: _OutgoingData instance.
-        Raises:
-            BadOperationException: when the thread has been requested to
-                terminate.
-        """
-        try:
-            self._deque_condition.acquire()
-            if self._stop_requested:
-                raise BadOperationException('Cannot write data anymore')
-
-            self._deque.append(data)
-            self._deque_condition.notify()
-        finally:
-            self._deque_condition.release()
-
-    def _write_data(self, outgoing_data):
-        message = (_encode_channel_id(outgoing_data.channel_id) +
-                   outgoing_data.data)
-        try:
-            self._mux_handler.physical_stream.send_message(
-                message=message, end=True, binary=True)
-        except Exception as e:
-            util.prepend_message_to_exception(
-                'Failed to send message to %r: ' %
-                (self._mux_handler.physical_connection.remote_addr,), e)
-            raise
-
-        # TODO(bashi): It would be better to block the thread that sends
-        # control data as well.
-        if outgoing_data.channel_id != _CONTROL_CHANNEL_ID:
-            self._mux_handler.notify_write_data_done(outgoing_data.channel_id)
-
-    def run(self):
-        try:
-            self._deque_condition.acquire()
-            while not self._stop_requested:
-                if len(self._deque) == 0:
-                    self._deque_condition.wait()
-                    continue
-
-                outgoing_data = self._deque.popleft()
-
-                self._deque_condition.release()
-                self._write_data(outgoing_data)
-                self._deque_condition.acquire()
-
-            # Flush deque.
-            #
-            # At this point, self._deque_condition is always acquired.
-            try:
-                while len(self._deque) > 0:
-                    outgoing_data = self._deque.popleft()
-                    self._write_data(outgoing_data)
-            finally:
-                self._deque_condition.release()
-
-            # Close physical connection.
-            try:
-                # Don't wait the response here. The response will be read
-                # by the reader thread.
-                self._mux_handler.physical_stream.close_connection(
-                    self._close_code, wait_response=False)
-            except Exception as e:
-                util.prepend_message_to_exception(
-                    'Failed to close the physical connection: %r' % e)
-                raise
-        finally:
-            self._mux_handler.notify_writer_done()
-
-    def stop(self, close_code=common.STATUS_NORMAL_CLOSURE):
-        """Stop the writer thread."""
-        self._deque_condition.acquire()
-        self._stop_requested = True
-        self._close_code = close_code
-        self._deque_condition.notify()
-        self._deque_condition.release()
-
-
-class _PhysicalConnectionReader(threading.Thread):
-
-    """A thread that is responsible for reading data from physical connection.
-    """
-
-    def __init__(self, mux_handler):
-        """Construct an instance.
-
-        Args:
-            mux_handler: _MuxHandler instance.
-        """
-        threading.Thread.__init__(self)
-        self._logger = util.get_class_logger(self)
-        self._mux_handler = mux_handler
-        self.setDaemon(True)
-
-    def run(self):
-        while True:
-            try:
-                physical_stream = self._mux_handler.physical_stream
-                message = physical_stream.receive_message()
-                if message is None:
-                    break
-                # Below happens only when a data message is received.
-                opcode = physical_stream.get_last_received_opcode()
-                if opcode != common.OPCODE_BINARY:
-                    self._mux_handler.fail_physical_connection(
-                        _DROP_CODE_INVALID_ENCAPSULATING_MESSAGE,
-                        'Received a text message on physical connection')
-                    break
-
-            except ConnectionTerminatedException as e:
-                self._logger.debug('%s', e)
-                break
-
-            try:
-                self._mux_handler.dispatch_message(message)
-            except PhysicalConnectionError as e:
-                self._mux_handler.fail_physical_connection(
-                    e.drop_code, e.message)
-                break
-            except LogicalChannelError as e:
-                self._mux_handler.fail_logical_channel(
-                    e.channel_id, e.drop_code, e.message)
-            except Exception as e:
-                self._logger.debug(traceback.format_exc())
-                break
-
-        self._mux_handler.notify_reader_done()
-
-
-class _Worker(threading.Thread):
-
-    """A thread that is responsible for running the corresponding application
-    handler.
-    """
-
-    def __init__(self, mux_handler, request):
-        """Construct an instance.
-
-        Args:
-            mux_handler: _MuxHandler instance.
-            request: _LogicalRequest instance.
-        """
-        threading.Thread.__init__(self)
-        self._logger = util.get_class_logger(self)
-        self._mux_handler = mux_handler
-        self._request = request
-        self.setDaemon(True)
-
-    def run(self):
-        self._logger.debug('Logical channel worker started. (id=%d)' %
-                           self._request.channel_id)
-        try:
-            # Non-critical exceptions will be handled by dispatcher.
-            self._mux_handler.dispatcher.transfer_data(self._request)
-        except LogicalChannelError as e:
-            self._mux_handler.fail_logical_channel(
-                e.channel_id, e.drop_code, e.message)
-        finally:
-            self._mux_handler.notify_worker_done(self._request.channel_id)
-
-
-class _MuxHandshaker(hybi.Handshaker):
-
-    """Opening handshake processor for multiplexing."""
-
-    _DUMMY_WEBSOCKET_KEY = 'dGhlIHNhbXBsZSBub25jZQ=='
-
-    def __init__(self, request, dispatcher, send_quota, receive_quota):
-        """Construct an instance.
-
-        Args:
-            request: _LogicalRequest instance.
-            dispatcher: Dispatcher instance (dispatch.Dispatcher).
-            send_quota: Initial send quota.
-            receive_quota: Initial receive quota.
-        """
-        hybi.Handshaker.__init__(self, request, dispatcher)
-        self._send_quota = send_quota
-        self._receive_quota = receive_quota
-
-        # Append headers which should not be included in handshake field of
-        # AddChannelRequest.
-        # TODO(bashi): Make sure whether we should raise exception when
-        #     these headers are included already.
-        request.headers_in[common.UPGRADE_HEADER] = (
-            common.WEBSOCKET_UPGRADE_TYPE)
-        request.headers_in[common.SEC_WEBSOCKET_VERSION_HEADER] = (
-            str(common.VERSION_HYBI_LATEST))
-        request.headers_in[common.SEC_WEBSOCKET_KEY_HEADER] = (
-            self._DUMMY_WEBSOCKET_KEY)
-
-    def _create_stream(self, stream_options):
-        """Override hybi.Handshaker._create_stream."""
-        self._logger.debug('Creating logical stream for %d' %
-                           self._request.channel_id)
-        return _LogicalStream(
-            self._request, stream_options, self._send_quota,
-            self._receive_quota)
-
-    def _create_handshake_response(self, accept):
-        """Override hybi._create_handshake_response."""
-        response = []
-
-        response.append('HTTP/1.1 101 Switching Protocols\r\n')
-
-        # Upgrade and Sec-WebSocket-Accept should be excluded.
-        response.append('%s: %s\r\n' % (
-            common.CONNECTION_HEADER, common.UPGRADE_CONNECTION_TYPE))
-        if self._request.ws_protocol is not None:
-            response.append('%s: %s\r\n' % (
-                common.SEC_WEBSOCKET_PROTOCOL_HEADER,
-                self._request.ws_protocol))
-        if (self._request.ws_extensions is not None and
-            len(self._request.ws_extensions) != 0):
-            response.append('%s: %s\r\n' % (
-                common.SEC_WEBSOCKET_EXTENSIONS_HEADER,
-                common.format_extensions(self._request.ws_extensions)))
-        response.append('\r\n')
-
-        return ''.join(response)
-
-    def _send_handshake(self, accept):
-        """Override hybi.Handshaker._send_handshake."""
-        # Don't send handshake response for the default channel
-        if self._request.channel_id == _DEFAULT_CHANNEL_ID:
-            return
-
-        handshake_response = self._create_handshake_response(accept)
-        frame_data = _create_add_channel_response(
-                         self._request.channel_id,
-                         handshake_response)
-        self._logger.debug('Sending handshake response for %d: %r' %
-                           (self._request.channel_id, frame_data))
-        self._request.connection.write_control_data(frame_data)
-
-
-class _LogicalChannelData(object):
-
-    """A structure that holds information about logical channel."""
-
-    def __init__(self, request, worker):
-        self.request = request
-        self.worker = worker
-        self.drop_code = _DROP_CODE_NORMAL_CLOSURE
-        self.drop_message = ''
-
-
-class _HandshakeDeltaBase(object):
-    """A class that holds information for delta-encoded handshake."""
-
-    def __init__(self, headers):
-        self._headers = headers
-
-    def create_headers(self, delta=None):
-        """Creates request headers for an AddChannelRequest that has
-        delta-encoded handshake.
-
-        Args:
-            delta: headers should be overridden.
-        """
-
-        headers = copy.copy(self._headers)
-        if delta:
-            for key, value in delta.items():
-                # The spec requires that a header with an empty value is
-                # removed from the delta base.
-                if len(value) == 0 and headers.has_key(key):
-                    del headers[key]
-                else:
-                    headers[key] = value
-        return headers
-
-
-class _MuxHandler(object):
-    """Multiplexing handler. When a handler starts, it launches three
-    threads; the reader thread, the writer thread, and a worker thread.
-
-    The reader thread reads data from the physical stream, i.e., the
-    ws_stream object of the underlying websocket connection. The reader
-    thread interprets multiplexed frames and dispatches them to logical
-    channels. Methods of this class are mostly called by the reader thread.
-
-    The writer thread sends multiplexed frames which are created by
-    logical channels via the physical connection.
-
-    The worker thread launched at the starting point handles the
-    "Implicitly Opened Connection". If multiplexing handler receives
-    an AddChannelRequest and accepts it, the handler will launch a new worker
-    thread and dispatch the request to it.
-    """
-
-    def __init__(self, request, dispatcher):
-        """Constructs an instance.
-
-        Args:
-            request: mod_python request of the physical connection.
-            dispatcher: Dispatcher instance (dispatch.Dispatcher).
-        """
-
-        self.original_request = request
-        self.dispatcher = dispatcher
-        self.physical_connection = request.connection
-        self.physical_stream = request.ws_stream
-        self._logger = util.get_class_logger(self)
-        self._logical_channels = {}
-        self._logical_channels_condition = threading.Condition()
-        # Holds client's initial quota
-        self._channel_slots = collections.deque()
-        self._handshake_base = None
-        self._worker_done_notify_received = False
-        self._reader = None
-        self._writer = None
-
-    def start(self):
-        """Starts the handler.
-
-        Raises:
-            MuxUnexpectedException: when the handler already started, or when
-                opening handshake of the default channel fails.
-        """
-
-        if self._reader or self._writer:
-            raise MuxUnexpectedException('MuxHandler already started')
-
-        self._reader = _PhysicalConnectionReader(self)
-        self._writer = _PhysicalConnectionWriter(self)
-        self._reader.start()
-        self._writer.start()
-
-        # Create "Implicitly Opened Connection".
-        logical_connection = _LogicalConnection(self, _DEFAULT_CHANNEL_ID)
-        headers = copy.copy(self.original_request.headers_in)
-        # Add extensions for logical channel.
-        headers[common.SEC_WEBSOCKET_EXTENSIONS_HEADER] = (
-            common.format_extensions(
-                self.original_request.mux_processor.extensions()))
-        self._handshake_base = _HandshakeDeltaBase(headers)
-        logical_request = _LogicalRequest(
-            _DEFAULT_CHANNEL_ID,
-            self.original_request.method,
-            self.original_request.uri,
-            self.original_request.protocol,
-            self._handshake_base.create_headers(),
-            logical_connection)
-        # Client's send quota for the implicitly opened connection is zero,
-        # but we will send FlowControl later so set the initial quota to
-        # _INITIAL_QUOTA_FOR_CLIENT.
-        self._channel_slots.append(_INITIAL_QUOTA_FOR_CLIENT)
-        send_quota = self.original_request.mux_processor.quota()
-        if not self._do_handshake_for_logical_request(
-            logical_request, send_quota=send_quota):
-            raise MuxUnexpectedException(
-                'Failed handshake on the default channel id')
-        self._add_logical_channel(logical_request)
-
-        # Send FlowControl for the implicitly opened connection.
-        frame_data = _create_flow_control(_DEFAULT_CHANNEL_ID,
-                                          _INITIAL_QUOTA_FOR_CLIENT)
-        logical_request.connection.write_control_data(frame_data)
-
-    def add_channel_slots(self, slots, send_quota):
-        """Adds channel slots.
-
-        Args:
-            slots: number of slots to be added.
-            send_quota: initial send quota for slots.
-        """
-
-        self._channel_slots.extend([send_quota] * slots)
-        # Send NewChannelSlot to client.
-        frame_data = _create_new_channel_slot(slots, send_quota)
-        self.send_control_data(frame_data)
-
-    def wait_until_done(self, timeout=None):
-        """Waits until all workers are done. Returns False when timeout has
-        occurred. Returns True on success.
-
-        Args:
-            timeout: timeout in sec.
-        """
-
-        self._logical_channels_condition.acquire()
-        try:
-            while len(self._logical_channels) > 0:
-                self._logger.debug('Waiting workers(%d)...' %
-                                   len(self._logical_channels))
-                self._worker_done_notify_received = False
-                self._logical_channels_condition.wait(timeout)
-                if not self._worker_done_notify_received:
-                    self._logger.debug('Waiting worker(s) timed out')
-                    return False
-        finally:
-            self._logical_channels_condition.release()
-
-        # Flush pending outgoing data
-        self._writer.stop()
-        self._writer.join()
-
-        return True
-
-    def notify_write_data_done(self, channel_id):
-        """Called by the writer thread when a write operation has done.
-
-        Args:
-            channel_id: objective channel id.
-        """
-
-        try:
-            self._logical_channels_condition.acquire()
-            if channel_id in self._logical_channels:
-                channel_data = self._logical_channels[channel_id]
-                channel_data.request.connection.on_write_data_done()
-            else:
-                self._logger.debug('Seems that logical channel for %d has gone'
-                                   % channel_id)
-        finally:
-            self._logical_channels_condition.release()
-
-    def send_control_data(self, data):
-        """Sends data via the control channel.
-
-        Args:
-            data: data to be sent.
-        """
-
-        self._writer.put_outgoing_data(_OutgoingData(
-                channel_id=_CONTROL_CHANNEL_ID, data=data))
-
-    def send_data(self, channel_id, data):
-        """Sends data via given logical channel. This method is called by
-        worker threads.
-
-        Args:
-            channel_id: objective channel id.
-            data: data to be sent.
-        """
-
-        self._writer.put_outgoing_data(_OutgoingData(
-                channel_id=channel_id, data=data))
-
-    def _send_drop_channel(self, channel_id, code=None, message=''):
-        frame_data = _create_drop_channel(channel_id, code, message)
-        self._logger.debug(
-            'Sending drop channel for channel id %d' % channel_id)
-        self.send_control_data(frame_data)
-
-    def _send_error_add_channel_response(self, channel_id, status=None):
-        if status is None:
-            status = common.HTTP_STATUS_BAD_REQUEST
-
-        if status in _HTTP_BAD_RESPONSE_MESSAGES:
-            message = _HTTP_BAD_RESPONSE_MESSAGES[status]
-        else:
-            self._logger.debug('Response message for %d is not found' % status)
-            message = '???'
-
-        response = 'HTTP/1.1 %d %s\r\n\r\n' % (status, message)
-        frame_data = _create_add_channel_response(channel_id,
-                                                  encoded_handshake=response,
-                                                  encoding=0, rejected=True)
-        self.send_control_data(frame_data)
-
-    def _create_logical_request(self, block):
-        if block.channel_id == _CONTROL_CHANNEL_ID:
-            # TODO(bashi): Raise PhysicalConnectionError with code 2006
-            # instead of MuxUnexpectedException.
-            raise MuxUnexpectedException(
-                'Received the control channel id (0) as objective channel '
-                'id for AddChannel')
-
-        if block.encoding > _HANDSHAKE_ENCODING_DELTA:
-            raise PhysicalConnectionError(
-                _DROP_CODE_UNKNOWN_REQUEST_ENCODING)
-
-        method, path, version, headers = _parse_request_text(
-            block.encoded_handshake)
-        if block.encoding == _HANDSHAKE_ENCODING_DELTA:
-            headers = self._handshake_base.create_headers(headers)
-
-        connection = _LogicalConnection(self, block.channel_id)
-        request = _LogicalRequest(block.channel_id, method, path, version,
-                                  headers, connection)
-        return request
-
-    def _do_handshake_for_logical_request(self, request, send_quota=0):
-        try:
-            receive_quota = self._channel_slots.popleft()
-        except IndexError:
-            raise LogicalChannelError(
-                request.channel_id, _DROP_CODE_NEW_CHANNEL_SLOT_VIOLATION)
-
-        handshaker = _MuxHandshaker(request, self.dispatcher,
-                                    send_quota, receive_quota)
-        try:
-            handshaker.do_handshake()
-        except handshake.VersionException as e:
-            self._logger.info('%s', e)
-            self._send_error_add_channel_response(
-                request.channel_id, status=common.HTTP_STATUS_BAD_REQUEST)
-            return False
-        except handshake.HandshakeException as e:
-            # TODO(bashi): Should we _Fail the Logical Channel_ with 3001
-            # instead?
-            self._logger.info('%s', e)
-            self._send_error_add_channel_response(request.channel_id,
-                                                  status=e.status)
-            return False
-        except handshake.AbortedByUserException as e:
-            self._logger.info('%s', e)
-            self._send_error_add_channel_response(request.channel_id)
-            return False
-
-        return True
-
-    def _add_logical_channel(self, logical_request):
-        try:
-            self._logical_channels_condition.acquire()
-            if logical_request.channel_id in self._logical_channels:
-                self._logger.debug('Channel id %d already exists' %
-                                   logical_request.channel_id)
-                raise PhysicalConnectionError(
-                    _DROP_CODE_CHANNEL_ALREADY_EXISTS,
-                    'Channel id %d already exists' %
-                    logical_request.channel_id)
-            worker = _Worker(self, logical_request)
-            channel_data = _LogicalChannelData(logical_request, worker)
-            self._logical_channels[logical_request.channel_id] = channel_data
-            worker.start()
-        finally:
-            self._logical_channels_condition.release()
-
-    def _process_add_channel_request(self, block):
-        try:
-            logical_request = self._create_logical_request(block)
-        except ValueError as e:
-            self._logger.debug('Failed to create logical request: %r' % e)
-            self._send_error_add_channel_response(
-                block.channel_id, status=common.HTTP_STATUS_BAD_REQUEST)
-            return
-        if self._do_handshake_for_logical_request(logical_request):
-            if block.encoding == _HANDSHAKE_ENCODING_IDENTITY:
-                # Update handshake base.
-                # TODO(bashi): Make sure this is the right place to update
-                # handshake base.
-                self._handshake_base = _HandshakeDeltaBase(
-                    logical_request.headers_in)
-            self._add_logical_channel(logical_request)
-        else:
-            self._send_error_add_channel_response(
-                block.channel_id, status=common.HTTP_STATUS_BAD_REQUEST)
-
-    def _process_flow_control(self, block):
-        try:
-            self._logical_channels_condition.acquire()
-            if not block.channel_id in self._logical_channels:
-                return
-            channel_data = self._logical_channels[block.channel_id]
-            channel_data.request.ws_stream.replenish_send_quota(
-                block.send_quota)
-        finally:
-            self._logical_channels_condition.release()
-
-    def _process_drop_channel(self, block):
-        self._logger.debug(
-            'DropChannel received for %d: code=%r, reason=%r' %
-            (block.channel_id, block.drop_code, block.drop_message))
-        try:
-            self._logical_channels_condition.acquire()
-            if not block.channel_id in self._logical_channels:
-                return
-            channel_data = self._logical_channels[block.channel_id]
-            channel_data.drop_code = _DROP_CODE_ACKNOWLEDGED
-
-            # Close the logical channel
-            channel_data.request.connection.set_read_state(
-                _LogicalConnection.STATE_TERMINATED)
-            channel_data.request.ws_stream.stop_sending()
-        finally:
-            self._logical_channels_condition.release()
-
-    def _process_control_blocks(self, parser):
-        for control_block in parser.read_control_blocks():
-            opcode = control_block.opcode
-            self._logger.debug('control block received, opcode: %d' % opcode)
-            if opcode == _MUX_OPCODE_ADD_CHANNEL_REQUEST:
-                self._process_add_channel_request(control_block)
-            elif opcode == _MUX_OPCODE_ADD_CHANNEL_RESPONSE:
-                raise PhysicalConnectionError(
-                    _DROP_CODE_INVALID_MUX_CONTROL_BLOCK,
-                    'Received AddChannelResponse')
-            elif opcode == _MUX_OPCODE_FLOW_CONTROL:
-                self._process_flow_control(control_block)
-            elif opcode == _MUX_OPCODE_DROP_CHANNEL:
-                self._process_drop_channel(control_block)
-            elif opcode == _MUX_OPCODE_NEW_CHANNEL_SLOT:
-                raise PhysicalConnectionError(
-                    _DROP_CODE_INVALID_MUX_CONTROL_BLOCK,
-                    'Received NewChannelSlot')
-            else:
-                raise MuxUnexpectedException(
-                    'Unexpected opcode %r' % opcode)
-
-    def _process_logical_frame(self, channel_id, parser):
-        self._logger.debug('Received a frame. channel id=%d' % channel_id)
-        try:
-            self._logical_channels_condition.acquire()
-            if not channel_id in self._logical_channels:
-                # We must ignore the message for an inactive channel.
-                return
-            channel_data = self._logical_channels[channel_id]
-            fin, rsv1, rsv2, rsv3, opcode, payload = parser.read_inner_frame()
-            consuming_byte = len(payload)
-            if opcode != common.OPCODE_CONTINUATION:
-                consuming_byte += 1
-            if not channel_data.request.ws_stream.consume_receive_quota(
-                consuming_byte):
-                # The client violates quota. Close logical channel.
-                raise LogicalChannelError(
-                    channel_id, _DROP_CODE_SEND_QUOTA_VIOLATION)
-            header = create_header(opcode, len(payload), fin, rsv1, rsv2, rsv3,
-                                   mask=False)
-            frame_data = header + payload
-            channel_data.request.connection.append_frame_data(frame_data)
-        finally:
-            self._logical_channels_condition.release()
-
-    def dispatch_message(self, message):
-        """Dispatches message. The reader thread calls this method.
-
-        Args:
-            message: a message that contains encapsulated frame.
-        Raises:
-            PhysicalConnectionError: if the message contains physical
-                connection level errors.
-            LogicalChannelError: if the message contains logical channel
-                level errors.
-        """
-
-        parser = _MuxFramePayloadParser(message)
-        try:
-            channel_id = parser.read_channel_id()
-        except ValueError as e:
-            raise PhysicalConnectionError(_DROP_CODE_CHANNEL_ID_TRUNCATED)
-        if channel_id == _CONTROL_CHANNEL_ID:
-            self._process_control_blocks(parser)
-        else:
-            self._process_logical_frame(channel_id, parser)
-
-    def notify_worker_done(self, channel_id):
-        """Called when a worker has finished.
-
-        Args:
-            channel_id: channel id corresponded with the worker.
-        """
-
-        self._logger.debug('Worker for channel id %d terminated' % channel_id)
-        try:
-            self._logical_channels_condition.acquire()
-            if not channel_id in self._logical_channels:
-                raise MuxUnexpectedException(
-                    'Channel id %d not found' % channel_id)
-            channel_data = self._logical_channels.pop(channel_id)
-        finally:
-            self._worker_done_notify_received = True
-            self._logical_channels_condition.notify()
-            self._logical_channels_condition.release()
-
-        if not channel_data.request.server_terminated:
-            self._send_drop_channel(
-                channel_id, code=channel_data.drop_code,
-                message=channel_data.drop_message)
-
-    def notify_reader_done(self):
-        """This method is called by the reader thread when the reader has
-        finished.
-        """
-
-        self._logger.debug(
-            'Termiating all logical connections waiting for incoming data '
-            '...')
-        self._logical_channels_condition.acquire()
-        for channel_data in self._logical_channels.values():
-            try:
-                channel_data.request.connection.set_read_state(
-                    _LogicalConnection.STATE_TERMINATED)
-            except Exception:
-                self._logger.debug(traceback.format_exc())
-        self._logical_channels_condition.release()
-
-    def notify_writer_done(self):
-        """This method is called by the writer thread when the writer has
-        finished.
-        """
-
-        self._logger.debug(
-            'Termiating all logical connections waiting for write '
-            'completion ...')
-        self._logical_channels_condition.acquire()
-        for channel_data in self._logical_channels.values():
-            try:
-                channel_data.request.connection.on_writer_done()
-            except Exception:
-                self._logger.debug(traceback.format_exc())
-        self._logical_channels_condition.release()
-
-    def fail_physical_connection(self, code, message):
-        """Fail the physical connection.
-
-        Args:
-            code: drop reason code.
-            message: drop message.
-        """
-
-        self._logger.debug('Failing the physical connection...')
-        self._send_drop_channel(_CONTROL_CHANNEL_ID, code, message)
-        self._writer.stop(common.STATUS_INTERNAL_ENDPOINT_ERROR)
-
-    def fail_logical_channel(self, channel_id, code, message):
-        """Fail a logical channel.
-
-        Args:
-            channel_id: channel id.
-            code: drop reason code.
-            message: drop message.
-        """
-
-        self._logger.debug('Failing logical channel %d...' % channel_id)
-        try:
-            self._logical_channels_condition.acquire()
-            if channel_id in self._logical_channels:
-                channel_data = self._logical_channels[channel_id]
-                # Close the logical channel. notify_worker_done() will be
-                # called later and it will send DropChannel.
-                channel_data.drop_code = code
-                channel_data.drop_message = message
-
-                channel_data.request.connection.set_read_state(
-                    _LogicalConnection.STATE_TERMINATED)
-                channel_data.request.ws_stream.stop_sending()
-            else:
-                self._send_drop_channel(channel_id, code, message)
-        finally:
-            self._logical_channels_condition.release()
-
-
-def use_mux(request):
-    return hasattr(request, 'mux_processor') and (
-        request.mux_processor.is_active())
-
-
-def start(request, dispatcher):
-    mux_handler = _MuxHandler(request, dispatcher)
-    mux_handler.start()
-
-    mux_handler.add_channel_slots(_INITIAL_NUMBER_OF_CHANNEL_SLOTS,
-                                  _INITIAL_QUOTA_FOR_CLIENT)
-
-    mux_handler.wait_until_done()
-
-
-# vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/standalone.py b/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/standalone.py
deleted file mode 100755
index 2c878606488..00000000000
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/standalone.py
+++ /dev/null
@@ -1,1208 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2012, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-"""Standalone WebSocket server.
-
-Use this file to launch pywebsocket without Apache HTTP Server.
-
-
-BASIC USAGE
-===========
-
-Go to the src directory and run
-
-  $ python mod_pywebsocket/standalone.py [-p <ws_port>]
-                                         [-w <websock_handlers>]
-                                         [-d <document_root>]
-
-<ws_port> is the port number to use for ws:// connection.
-
-<document_root> is the path to the root directory of HTML files.
-
-<websock_handlers> is the path to the root directory of WebSocket handlers.
-If not specified, <document_root> will be used. See __init__.py (or
-run $ pydoc mod_pywebsocket) for how to write WebSocket handlers.
-
-For more detail and other options, run
-
-  $ python mod_pywebsocket/standalone.py --help
-
-or see _build_option_parser method below.
-
-For trouble shooting, adding "--log_level debug" might help you.
-
-
-TRY DEMO
-========
-
-Go to the src directory and run standalone.py with -d option to set the
-document root to the directory containing example HTMLs and handlers like this:
-
-  $ cd src
-  $ PYTHONPATH=. python mod_pywebsocket/standalone.py -d example
-
-to launch pywebsocket with the sample handler and html on port 80. Open
-http://localhost/console.html, click the connect button, type something into
-the text box next to the send button and click the send button. If everything
-is working, you'll see the message you typed echoed by the server.
-
-
-USING TLS
-=========
-
-To run the standalone server with TLS support, run it with -t, -k, and -c
-options. When TLS is enabled, the standalone server accepts only TLS connection.
-
-Note that when ssl module is used and the key/cert location is incorrect,
-TLS connection silently fails while pyOpenSSL fails on startup.
-
-Example:
-
-  $ PYTHONPATH=. python mod_pywebsocket/standalone.py \
-        -d example \
-        -p 10443 \
-        -t \
-        -c ../test/cert/cert.pem \
-        -k ../test/cert/key.pem \
-
-Note that when passing a relative path to -c and -k option, it will be resolved
-using the document root directory as the base.
-
-
-USING CLIENT AUTHENTICATION
-===========================
-
-To run the standalone server with TLS client authentication support, run it with
---tls-client-auth and --tls-client-ca options in addition to ones required for
-TLS support.
-
-Example:
-
-  $ PYTHONPATH=. python mod_pywebsocket/standalone.py -d example -p 10443 -t \
-        -c ../test/cert/cert.pem -k ../test/cert/key.pem \
-        --tls-client-auth \
-        --tls-client-ca=../test/cert/cacert.pem
-
-Note that when passing a relative path to --tls-client-ca option, it will be
-resolved using the document root directory as the base.
-
-
-CONFIGURATION FILE
-==================
-
-You can also write a configuration file and use it by specifying the path to
-the configuration file by --config option. Please write a configuration file
-following the documentation of the Python ConfigParser library. Name of each
-entry must be the long version argument name. E.g. to set log level to debug,
-add the following line:
-
-log_level=debug
-
-For options which doesn't take value, please add some fake value. E.g. for
---tls option, add the following line:
-
-tls=True
-
-Note that tls will be enabled even if you write tls=False as the value part is
-fake.
-
-When both a command line argument and a configuration file entry are set for
-the same configuration item, the command line value will override one in the
-configuration file.
-
-
-THREADING
-=========
-
-This server is derived from socketserver.ThreadingMixIn. Hence a thread is
-used for each request.
-
-
-SECURITY WARNING
-================
-
-This uses CGIHTTPServer and CGIHTTPServer is not secure.
-It may execute arbitrary Python code or external programs. It should not be
-used outside a firewall.
-"""
-
-from six.moves import BaseHTTPServer
-from six.moves import CGIHTTPServer
-from six.moves import SimpleHTTPServer
-from six.moves import socketserver
-from six.moves import configparser
-import base64
-from six.moves import http_client
-import logging
-import logging.handlers
-import optparse
-import os
-import re
-import select
-import socket
-import sys
-import threading
-import time
-from six.moves import urllib
-
-from mod_pywebsocket import common
-from mod_pywebsocket import dispatch
-from mod_pywebsocket import handshake
-from mod_pywebsocket import http_header_util
-from mod_pywebsocket import memorizingfile
-from mod_pywebsocket import util
-from mod_pywebsocket.xhr_benchmark_handler import XHRBenchmarkHandler
-
-
-_DEFAULT_LOG_MAX_BYTES = 1024 * 256
-_DEFAULT_LOG_BACKUP_COUNT = 5
-
-_DEFAULT_REQUEST_QUEUE_SIZE = 128
-
-# 1024 is practically large enough to contain WebSocket handshake lines.
-_MAX_MEMORIZED_LINES = 1024
-
-# Constants for the --tls_module flag.
-_TLS_BY_STANDARD_MODULE = 'ssl'
-_TLS_BY_PYOPENSSL = 'pyopenssl'
-
-
-class _StandaloneConnection(object):
-    """Mimic mod_python mp_conn."""
-
-    def __init__(self, request_handler):
-        """Construct an instance.
-
-        Args:
-            request_handler: A WebSocketRequestHandler instance.
-        """
-
-        self._request_handler = request_handler
-
-    def get_local_addr(self):
-        """Getter to mimic mp_conn.local_addr."""
-
-        return (self._request_handler.server.server_name,
-                self._request_handler.server.server_port)
-    local_addr = property(get_local_addr)
-
-    def get_remote_addr(self):
-        """Getter to mimic mp_conn.remote_addr.
-
-        Setting the property in __init__ won't work because the request
-        handler is not initialized yet there."""
-
-        return self._request_handler.client_address
-    remote_addr = property(get_remote_addr)
-
-    def write(self, data):
-        """Mimic mp_conn.write()."""
-
-        return self._request_handler.wfile.write(data)
-
-    def read(self, length):
-        """Mimic mp_conn.read()."""
-
-        return self._request_handler.rfile.read(length)
-
-    def get_memorized_lines(self):
-        """Get memorized lines."""
-
-        return self._request_handler.rfile.get_memorized_lines()
-
-
-class _StandaloneRequest(object):
-    """Mimic mod_python request."""
-
-    def __init__(self, request_handler, use_tls):
-        """Construct an instance.
-
-        Args:
-            request_handler: A WebSocketRequestHandler instance.
-        """
-
-        self._logger = util.get_class_logger(self)
-
-        self._request_handler = request_handler
-        self.connection = _StandaloneConnection(request_handler)
-        self._use_tls = use_tls
-        self.headers_in = request_handler.headers
-
-    def get_uri(self):
-        """Getter to mimic request.uri.
-
-        This method returns the raw data at the Request-URI part of the
-        Request-Line, while the uri method on the request object of mod_python
-        returns the path portion after parsing the raw data. This behavior is
-        kept for compatibility.
-        """
-
-        return self._request_handler.path
-    uri = property(get_uri)
-
-    def get_unparsed_uri(self):
-        """Getter to mimic request.unparsed_uri."""
-
-        return self._request_handler.path
-    unparsed_uri = property(get_unparsed_uri)
-
-    def get_method(self):
-        """Getter to mimic request.method."""
-
-        return self._request_handler.command
-    method = property(get_method)
-
-    def get_protocol(self):
-        """Getter to mimic request.protocol."""
-
-        return self._request_handler.request_version
-    protocol = property(get_protocol)
-
-    def is_https(self):
-        """Mimic request.is_https()."""
-
-        return self._use_tls
-
-
-def _import_ssl():
-    global ssl
-    try:
-        import ssl
-        return True
-    except ImportError:
-        return False
-
-
-def _import_pyopenssl():
-    global OpenSSL
-    try:
-        import OpenSSL.SSL
-        return True
-    except ImportError:
-        return False
-
-
-class _StandaloneSSLConnection(object):
-    """A wrapper class for OpenSSL.SSL.Connection to
-    - provide makefile method which is not supported by the class
-    - tweak shutdown method since OpenSSL.SSL.Connection.shutdown doesn't
-      accept the "how" argument.
-    - convert SysCallError exceptions that its recv method may raise into a
-      return value of '', meaning EOF. We cannot overwrite the recv method on
-      self._connection since it's immutable.
-    """
-
-    _OVERRIDDEN_ATTRIBUTES = ['_connection', 'makefile', 'shutdown', 'recv']
-
-    def __init__(self, connection):
-        self._connection = connection
-
-    def __getattribute__(self, name):
-        if name in _StandaloneSSLConnection._OVERRIDDEN_ATTRIBUTES:
-            return object.__getattribute__(self, name)
-        return self._connection.__getattribute__(name)
-
-    def __setattr__(self, name, value):
-        if name in _StandaloneSSLConnection._OVERRIDDEN_ATTRIBUTES:
-            return object.__setattr__(self, name, value)
-        return self._connection.__setattr__(name, value)
-
-    def makefile(self, mode='r', bufsize=-1):
-        return socket._fileobject(self, mode, bufsize)
-
-    def shutdown(self, unused_how):
-        self._connection.shutdown()
-
-    def recv(self, bufsize, flags=0):
-        if flags != 0:
-            raise ValueError('Non-zero flags not allowed')
-
-        try:
-            return self._connection.recv(bufsize)
-        except OpenSSL.SSL.SysCallError as e:
-            if e.args[0] == -1:
-                # Suppress "unexpected EOF" exception. See the OpenSSL document
-                # for SSL_get_error.
-                return ''
-            raise
-
-
-def _alias_handlers(dispatcher, websock_handlers_map_file):
-    """Set aliases specified in websock_handler_map_file in dispatcher.
-
-    Args:
-        dispatcher: dispatch.Dispatcher instance
-        websock_handler_map_file: alias map file
-    """
-
-    fp = open(websock_handlers_map_file)
-    try:
-        for line in fp:
-            if line[0] == '#' or line.isspace():
-                continue
-            m = re.match(r'(\S+)\s+(\S+)', line)
-            if not m:
-                logging.warning('Wrong format in map file:' + line)
-                continue
-            try:
-                dispatcher.add_resource_path_alias(
-                    m.group(1), m.group(2))
-            except dispatch.DispatchException as e:
-                logging.error(str(e))
-    finally:
-        fp.close()
-
-
-class WebSocketServer(socketserver.ThreadingMixIn, BaseHTTPServer.HTTPServer):
-    """HTTPServer specialized for WebSocket."""
-
-    # Overrides socketserver.ThreadingMixIn.daemon_threads
-    daemon_threads = True
-    # Overrides BaseHTTPServer.HTTPServer.allow_reuse_address
-    allow_reuse_address = True
-
-    def __init__(self, options):
-        """Override socketserver.TCPServer.__init__ to set SSL enabled
-        socket object to self.socket before server_bind and server_activate,
-        if necessary.
-        """
-
-        # Share a Dispatcher among request handlers to save time for
-        # instantiation.  Dispatcher can be shared because it is thread-safe.
-        options.dispatcher = dispatch.Dispatcher(
-            options.websock_handlers,
-            options.scan_dir,
-            options.allow_handlers_outside_root_dir)
-        if options.websock_handlers_map_file:
-            _alias_handlers(options.dispatcher,
-                            options.websock_handlers_map_file)
-        warnings = options.dispatcher.source_warnings()
-        if warnings:
-            for warning in warnings:
-                logging.warning('Warning in source loading: %s' % warning)
-
-        self._logger = util.get_class_logger(self)
-
-        self.request_queue_size = options.request_queue_size
-        self.__ws_is_shut_down = threading.Event()
-        self.__ws_serving = False
-
-        socketserver.BaseServer.__init__(
-            self, (options.server_host, options.port), WebSocketRequestHandler)
-
-        # Expose the options object to allow handler objects access it. We name
-        # it with websocket_ prefix to avoid conflict.
-        self.websocket_server_options = options
-
-        self._create_sockets()
-        self.server_bind()
-        self.server_activate()
-
-    def _create_sockets(self):
-        self.server_name, self.server_port = self.server_address
-        self._sockets = []
-        if not self.server_name:
-            # On platforms that doesn't support IPv6, the first bind fails.
-            # On platforms that supports IPv6
-            # - If it binds both IPv4 and IPv6 on call with AF_INET6, the
-            #   first bind succeeds and the second fails (we'll see 'Address
-            #   already in use' error).
-            # - If it binds only IPv6 on call with AF_INET6, both call are
-            #   expected to succeed to listen both protocol.
-            addrinfo_array = [
-                (socket.AF_INET6, socket.SOCK_STREAM, '', '', ''),
-                (socket.AF_INET, socket.SOCK_STREAM, '', '', '')]
-        else:
-            addrinfo_array = socket.getaddrinfo(self.server_name,
-                                                self.server_port,
-                                                socket.AF_UNSPEC,
-                                                socket.SOCK_STREAM,
-                                                socket.IPPROTO_TCP)
-        for addrinfo in addrinfo_array:
-            self._logger.info('Create socket on: %r', addrinfo)
-            family, socktype, proto, canonname, sockaddr = addrinfo
-            try:
-                socket_ = socket.socket(family, socktype)
-            except Exception as e:
-                self._logger.info('Skip by failure: %r', e)
-                continue
-            server_options = self.websocket_server_options
-            if server_options.use_tls:
-                # For the case of _HAS_OPEN_SSL, we do wrapper setup after
-                # accept.
-                if server_options.tls_module == _TLS_BY_STANDARD_MODULE:
-                    if server_options.tls_client_auth:
-                        if server_options.tls_client_cert_optional:
-                            client_cert_ = ssl.CERT_OPTIONAL
-                        else:
-                            client_cert_ = ssl.CERT_REQUIRED
-                    else:
-                        client_cert_ = ssl.CERT_NONE
-                    socket_ = ssl.wrap_socket(socket_,
-                        keyfile=server_options.private_key,
-                        certfile=server_options.certificate,
-                        ssl_version=ssl.PROTOCOL_SSLv23,
-                        ca_certs=server_options.tls_client_ca,
-                        cert_reqs=client_cert_,
-                        do_handshake_on_connect=False)
-            self._sockets.append((socket_, addrinfo))
-
-    def server_bind(self):
-        """Override socketserver.TCPServer.server_bind to enable multiple
-        sockets bind.
-        """
-
-        failed_sockets = []
-
-        for socketinfo in self._sockets:
-            socket_, addrinfo = socketinfo
-            self._logger.info('Bind on: %r', addrinfo)
-            if self.allow_reuse_address:
-                socket_.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-            try:
-                socket_.bind(self.server_address)
-            except Exception as e:
-                self._logger.info('Skip by failure: %r', e)
-                socket_.close()
-                failed_sockets.append(socketinfo)
-            if self.server_address[1] == 0:
-                # The operating system assigns the actual port number for port
-                # number 0. This case, the second and later sockets should use
-                # the same port number. Also self.server_port is rewritten
-                # because it is exported, and will be used by external code.
-                self.server_address = (
-                    self.server_name, socket_.getsockname()[1])
-                self.server_port = self.server_address[1]
-                self._logger.info('Port %r is assigned', self.server_port)
-
-        for socketinfo in failed_sockets:
-            self._sockets.remove(socketinfo)
-
-    def server_activate(self):
-        """Override socketserver.TCPServer.server_activate to enable multiple
-        sockets listen.
-        """
-
-        failed_sockets = []
-
-        for socketinfo in self._sockets:
-            socket_, addrinfo = socketinfo
-            self._logger.info('Listen on: %r', addrinfo)
-            try:
-                socket_.listen(self.request_queue_size)
-            except Exception as e:
-                self._logger.info('Skip by failure: %r', e)
-                socket_.close()
-                failed_sockets.append(socketinfo)
-
-        for socketinfo in failed_sockets:
-            self._sockets.remove(socketinfo)
-
-        if len(self._sockets) == 0:
-            self._logger.critical(
-                'No sockets activated. Use info log level to see the reason.')
-
-    def server_close(self):
-        """Override socketserver.TCPServer.server_close to enable multiple
-        sockets close.
-        """
-
-        for socketinfo in self._sockets:
-            socket_, addrinfo = socketinfo
-            self._logger.info('Close on: %r', addrinfo)
-            socket_.close()
-
-    def fileno(self):
-        """Override socketserver.TCPServer.fileno."""
-
-        self._logger.critical('Not supported: fileno')
-        return self._sockets[0][0].fileno()
-
-    def handle_error(self, request, client_address):
-        """Override socketserver.handle_error."""
-
-        self._logger.error(
-            'Exception in processing request from: %r\n%s',
-            client_address,
-            util.get_stack_trace())
-        # Note: client_address is a tuple.
-
-    def get_request(self):
-        """Override TCPServer.get_request to wrap OpenSSL.SSL.Connection
-        object with _StandaloneSSLConnection to provide makefile method. We
-        cannot substitute OpenSSL.SSL.Connection.makefile since it's readonly
-        attribute.
-        """
-
-        accepted_socket, client_address = self.socket.accept()
-
-        server_options = self.websocket_server_options
-        if server_options.use_tls:
-            if server_options.tls_module == _TLS_BY_STANDARD_MODULE:
-                try:
-                    accepted_socket.do_handshake()
-                except ssl.SSLError as e:
-                    self._logger.debug('%r', e)
-                    raise
-
-                # Print cipher in use. Handshake is done on accept.
-                self._logger.debug('Cipher: %s', accepted_socket.cipher())
-                self._logger.debug('Client cert: %r',
-                                   accepted_socket.getpeercert())
-            elif server_options.tls_module == _TLS_BY_PYOPENSSL:
-                # We cannot print the cipher in use. pyOpenSSL doesn't provide
-                # any method to fetch that.
-
-                ctx = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv23_METHOD)
-                ctx.use_privatekey_file(server_options.private_key)
-                ctx.use_certificate_file(server_options.certificate)
-
-                def default_callback(conn, cert, errnum, errdepth, ok):
-                    return ok == 1
-
-                # See the OpenSSL document for SSL_CTX_set_verify.
-                if server_options.tls_client_auth:
-                    verify_mode = OpenSSL.SSL.VERIFY_PEER
-                    if not server_options.tls_client_cert_optional:
-                        verify_mode |= OpenSSL.SSL.VERIFY_FAIL_IF_NO_PEER_CERT
-                    ctx.set_verify(verify_mode, default_callback)
-                    ctx.load_verify_locations(server_options.tls_client_ca,
-                                              None)
-                else:
-                    ctx.set_verify(OpenSSL.SSL.VERIFY_NONE, default_callback)
-
-                accepted_socket = OpenSSL.SSL.Connection(ctx, accepted_socket)
-                accepted_socket.set_accept_state()
-
-                # Convert SSL related error into socket.error so that
-                # SocketServer ignores them and keeps running.
-                #
-                # TODO(tyoshino): Convert all kinds of errors.
-                try:
-                    accepted_socket.do_handshake()
-                except OpenSSL.SSL.Error as e:
-                    # Set errno part to 1 (SSL_ERROR_SSL) like the ssl module
-                    # does.
-                    self._logger.debug('%r', e)
-                    raise socket.error(1, '%r' % e)
-                cert = accepted_socket.get_peer_certificate()
-                if cert is not None:
-                    self._logger.debug('Client cert subject: %r',
-                                       cert.get_subject().get_components())
-                accepted_socket = _StandaloneSSLConnection(accepted_socket)
-            else:
-                raise ValueError('No TLS support module is available')
-
-        return accepted_socket, client_address
-
-    def serve_forever(self, poll_interval=0.5):
-        """Override socketserver.BaseServer.serve_forever."""
-
-        self.__ws_serving = True
-        self.__ws_is_shut_down.clear()
-        handle_request = self.handle_request
-        if hasattr(self, '_handle_request_noblock'):
-            handle_request = self._handle_request_noblock
-        else:
-            self._logger.warning('Fallback to blocking request handler')
-        try:
-            while self.__ws_serving:
-                r, w, e = select.select(
-                    [socket_[0] for socket_ in self._sockets],
-                    [], [], poll_interval)
-                for socket_ in r:
-                    self.socket = socket_
-                    handle_request()
-                self.socket = None
-        finally:
-            self.__ws_is_shut_down.set()
-
-    def shutdown(self):
-        """Override socketserver.BaseServer.shutdown."""
-
-        self.__ws_serving = False
-        self.__ws_is_shut_down.wait()
-
-
-class WebSocketRequestHandler(CGIHTTPServer.CGIHTTPRequestHandler):
-    """CGIHTTPRequestHandler specialized for WebSocket."""
-
-    # Use http_client.HTTPMessage instead of mimetools.Message.
-    MessageClass = http_client.HTTPMessage
-
-    protocol_version = "HTTP/1.1"
-
-    def setup(self):
-        """Override socketserver.StreamRequestHandler.setup to wrap rfile
-        with MemorizingFile.
-
-        This method will be called by BaseRequestHandler's constructor
-        before calling BaseHTTPRequestHandler.handle.
-        BaseHTTPRequestHandler.handle will call
-        BaseHTTPRequestHandler.handle_one_request and it will call
-        WebSocketRequestHandler.parse_request.
-        """
-
-        # Call superclass's setup to prepare rfile, wfile, etc. See setup
-        # definition on the root class socketserver.StreamRequestHandler to
-        # understand what this does.
-        CGIHTTPServer.CGIHTTPRequestHandler.setup(self)
-
-        self.rfile = memorizingfile.MemorizingFile(
-            self.rfile,
-            max_memorized_lines=_MAX_MEMORIZED_LINES)
-
-    def __init__(self, request, client_address, server):
-        self._logger = util.get_class_logger(self)
-
-        self._options = server.websocket_server_options
-
-        # Overrides CGIHTTPServerRequestHandler.cgi_directories.
-        self.cgi_directories = self._options.cgi_directories
-        # Replace CGIHTTPRequestHandler.is_executable method.
-        if self._options.is_executable_method is not None:
-            self.is_executable = self._options.is_executable_method
-
-        # This actually calls BaseRequestHandler.__init__.
-        CGIHTTPServer.CGIHTTPRequestHandler.__init__(
-            self, request, client_address, server)
-
-    def parse_request(self):
-        """Override BaseHTTPServer.BaseHTTPRequestHandler.parse_request.
-
-        Return True to continue processing for HTTP(S), False otherwise.
-
-        See BaseHTTPRequestHandler.handle_one_request method which calls
-        this method to understand how the return value will be handled.
-        """
-
-        # We hook parse_request method, but also call the original
-        # CGIHTTPRequestHandler.parse_request since when we return False,
-        # CGIHTTPRequestHandler.handle_one_request continues processing and
-        # it needs variables set by CGIHTTPRequestHandler.parse_request.
-        #
-        # Variables set by this method will be also used by WebSocket request
-        # handling (self.path, self.command, self.requestline, etc. See also
-        # how _StandaloneRequest's members are implemented using these
-        # attributes).
-        if not CGIHTTPServer.CGIHTTPRequestHandler.parse_request(self):
-            return False
-
-        if self.command == "CONNECT":
-            self.send_response(200, "Connected")
-            self.send_header("Connection", "keep-alive")
-            self.end_headers()
-            return False
-
-        if self._options.use_basic_auth:
-            auth = self.headers.getheader('Authorization')
-            if auth != self._options.basic_auth_credential:
-                self.send_response(401)
-                self.send_header('WWW-Authenticate',
-                                 'Basic realm="Pywebsocket"')
-                self.end_headers()
-                self._logger.info('Request basic authentication')
-                return False
-
-        # Special paths for XMLHttpRequest benchmark
-        xhr_benchmark_helper_prefix = '/073be001e10950692ccbf3a2ad21c245'
-        parsed_path = urllib.parse.urlsplit(self.path)
-        if parsed_path.path == (xhr_benchmark_helper_prefix + '_send'):
-            xhr_benchmark_handler = XHRBenchmarkHandler(
-                self.headers, self.rfile, self.wfile)
-            xhr_benchmark_handler.do_send()
-            return False
-        if parsed_path.path == (xhr_benchmark_helper_prefix + '_receive'):
-            xhr_benchmark_handler = XHRBenchmarkHandler(
-                self.headers, self.rfile, self.wfile)
-            xhr_benchmark_handler.do_receive_and_parse()
-            return False
-        if parsed_path.path == (xhr_benchmark_helper_prefix +
-                                '_receive_getnocache'):
-            xhr_benchmark_handler = XHRBenchmarkHandler(
-                self.headers, self.rfile, self.wfile)
-            xhr_benchmark_handler.do_receive(
-                int(parsed_path.query), False, False)
-            return False
-        if parsed_path.path == (xhr_benchmark_helper_prefix +
-                                '_receive_getcache'):
-            xhr_benchmark_handler = XHRBenchmarkHandler(
-                self.headers, self.rfile, self.wfile)
-            xhr_benchmark_handler.do_receive(
-                int(parsed_path.query), False, True)
-            return False
-
-        host, port, resource = http_header_util.parse_uri(self.path)
-        if resource is None:
-            self._logger.info('Invalid URI: %r', self.path)
-            self._logger.info('Fallback to CGIHTTPRequestHandler')
-            return True
-        server_options = self.server.websocket_server_options
-        if host is not None:
-            validation_host = server_options.validation_host
-            if validation_host is not None and host != validation_host:
-                self._logger.info('Invalid host: %r (expected: %r)',
-                                  host,
-                                  validation_host)
-                self._logger.info('Fallback to CGIHTTPRequestHandler')
-                return True
-        if port is not None:
-            validation_port = server_options.validation_port
-            if validation_port is not None and port != validation_port:
-                self._logger.info('Invalid port: %r (expected: %r)',
-                                  port,
-                                  validation_port)
-                self._logger.info('Fallback to CGIHTTPRequestHandler')
-                return True
-        self.path = resource
-
-        request = _StandaloneRequest(self, self._options.use_tls)
-
-        try:
-            # Fallback to default http handler for request paths for which
-            # we don't have request handlers.
-            if not self._options.dispatcher.get_handler_suite(self.path):
-                self._logger.info('No handler for resource: %r',
-                                  self.path)
-                self._logger.info('Fallback to CGIHTTPRequestHandler')
-                return True
-        except dispatch.DispatchException as e:
-            self._logger.info('Dispatch failed for error: %s', e)
-            self.send_error(e.status)
-            return False
-
-        # If any Exceptions without except clause setup (including
-        # DispatchException) is raised below this point, it will be caught
-        # and logged by WebSocketServer.
-
-        try:
-            try:
-                handshake.do_handshake(
-                    request,
-                    self._options.dispatcher,
-                    allowDraft75=self._options.allow_draft75,
-                    strict=self._options.strict)
-            except handshake.VersionException as e:
-                self._logger.info('Handshake failed for version error: %s', e)
-                self.send_response(common.HTTP_STATUS_BAD_REQUEST)
-                self.send_header(common.SEC_WEBSOCKET_VERSION_HEADER,
-                                 e.supported_versions)
-                self.end_headers()
-                return False
-            except handshake.HandshakeException as e:
-                # Handshake for ws(s) failed.
-                self._logger.info('Handshake failed for error: %s', e)
-                self.send_error(e.status)
-                return False
-
-            request._dispatcher = self._options.dispatcher
-            self._options.dispatcher.transfer_data(request)
-        except handshake.AbortedByUserException as e:
-            self._logger.info('Aborted: %s', e)
-        return False
-
-    def log_request(self, code='-', size='-'):
-        """Override BaseHTTPServer.log_request."""
-
-        self._logger.info('"%s" %s %s',
-                          self.requestline, str(code), str(size))
-
-    def log_error(self, *args):
-        """Override BaseHTTPServer.log_error."""
-
-        # Despite the name, this method is for warnings than for errors.
-        # For example, HTTP status code is logged by this method.
-        self._logger.warning('%s - %s',
-                             self.address_string(),
-                             args[0] % args[1:])
-
-    def is_cgi(self):
-        """Test whether self.path corresponds to a CGI script.
-
-        Add extra check that self.path doesn't contains ..
-        Also check if the file is a executable file or not.
-        If the file is not executable, it is handled as static file or dir
-        rather than a CGI script.
-        """
-
-        if CGIHTTPServer.CGIHTTPRequestHandler.is_cgi(self):
-            if '..' in self.path:
-                return False
-            # strip query parameter from request path
-            resource_name = self.path.split('?', 2)[0]
-            # convert resource_name into real path name in filesystem.
-            scriptfile = self.translate_path(resource_name)
-            if not os.path.isfile(scriptfile):
-                return False
-            if not self.is_executable(scriptfile):
-                return False
-            return True
-        return False
-
-
-def _get_logger_from_class(c):
-    return logging.getLogger('%s.%s' % (c.__module__, c.__name__))
-
-
-def _configure_logging(options):
-    logging.addLevelName(common.LOGLEVEL_FINE, 'FINE')
-
-    logger = logging.getLogger()
-    logger.setLevel(logging.getLevelName(options.log_level.upper()))
-    if options.log_file:
-        handler = logging.handlers.RotatingFileHandler(
-                options.log_file, 'a', options.log_max, options.log_count)
-    else:
-        handler = logging.StreamHandler()
-    formatter = logging.Formatter(
-            '[%(asctime)s] [%(levelname)s] %(name)s: %(message)s')
-    handler.setFormatter(formatter)
-    logger.addHandler(handler)
-
-    deflate_log_level_name = logging.getLevelName(
-        options.deflate_log_level.upper())
-    _get_logger_from_class(util._Deflater).setLevel(
-        deflate_log_level_name)
-    _get_logger_from_class(util._Inflater).setLevel(
-        deflate_log_level_name)
-
-
-def _build_option_parser():
-    parser = optparse.OptionParser()
-
-    parser.add_option('--config', dest='config_file', type='string',
-                      default=None,
-                      help=('Path to configuration file. See the file comment '
-                            'at the top of this file for the configuration '
-                            'file format'))
-    parser.add_option('-H', '--server-host', '--server_host',
-                      dest='server_host',
-                      default='',
-                      help='server hostname to listen to')
-    parser.add_option('-V', '--validation-host', '--validation_host',
-                      dest='validation_host',
-                      default=None,
-                      help='server hostname to validate in absolute path.')
-    parser.add_option('-p', '--port', dest='port', type='int',
-                      default=common.DEFAULT_WEB_SOCKET_PORT,
-                      help='port to listen to')
-    parser.add_option('-P', '--validation-port', '--validation_port',
-                      dest='validation_port', type='int',
-                      default=None,
-                      help='server port to validate in absolute path.')
-    parser.add_option('-w', '--websock-handlers', '--websock_handlers',
-                      dest='websock_handlers',
-                      default='.',
-                      help=('The root directory of WebSocket handler files. '
-                            'If the path is relative, --document-root is used '
-                            'as the base.'))
-    parser.add_option('-m', '--websock-handlers-map-file',
-                      '--websock_handlers_map_file',
-                      dest='websock_handlers_map_file',
-                      default=None,
-                      help=('WebSocket handlers map file. '
-                            'Each line consists of alias_resource_path and '
-                            'existing_resource_path, separated by spaces.'))
-    parser.add_option('-s', '--scan-dir', '--scan_dir', dest='scan_dir',
-                      default=None,
-                      help=('Must be a directory under --websock-handlers. '
-                            'Only handlers under this directory are scanned '
-                            'and registered to the server. '
-                            'Useful for saving scan time when the handler '
-                            'root directory contains lots of files that are '
-                            'not handler file or are handler files but you '
-                            'don\'t want them to be registered. '))
-    parser.add_option('--allow-handlers-outside-root-dir',
-                      '--allow_handlers_outside_root_dir',
-                      dest='allow_handlers_outside_root_dir',
-                      action='store_true',
-                      default=False,
-                      help=('Scans WebSocket handlers even if their canonical '
-                            'path is not under --websock-handlers.'))
-    parser.add_option('-d', '--document-root', '--document_root',
-                      dest='document_root', default='.',
-                      help='Document root directory.')
-    parser.add_option('-x', '--cgi-paths', '--cgi_paths', dest='cgi_paths',
-                      default=None,
-                      help=('CGI paths relative to document_root.'
-                            'Comma-separated. (e.g -x /cgi,/htbin) '
-                            'Files under document_root/cgi_path are handled '
-                            'as CGI programs. Must be executable.'))
-    parser.add_option('-t', '--tls', dest='use_tls', action='store_true',
-                      default=False, help='use TLS (wss://)')
-    parser.add_option('--tls-module', '--tls_module', dest='tls_module',
-                      type='choice',
-                      choices = [_TLS_BY_STANDARD_MODULE, _TLS_BY_PYOPENSSL],
-                      help='Use ssl module if "%s" is specified. '
-                      'Use pyOpenSSL module if "%s" is specified' %
-                      (_TLS_BY_STANDARD_MODULE, _TLS_BY_PYOPENSSL))
-    parser.add_option('-k', '--private-key', '--private_key',
-                      dest='private_key',
-                      default='', help='TLS private key file.')
-    parser.add_option('-c', '--certificate', dest='certificate',
-                      default='', help='TLS certificate file.')
-    parser.add_option('--tls-client-auth', dest='tls_client_auth',
-                      action='store_true', default=False,
-                      help='Requests TLS client auth on every connection.')
-    parser.add_option('--tls-client-cert-optional',
-                      dest='tls_client_cert_optional',
-                      action='store_true', default=False,
-                      help=('Makes client certificate optional even though '
-                            'TLS client auth is enabled.'))
-    parser.add_option('--tls-client-ca', dest='tls_client_ca', default='',
-                      help=('Specifies a pem file which contains a set of '
-                            'concatenated CA certificates which are used to '
-                            'validate certificates passed from clients'))
-    parser.add_option('--basic-auth', dest='use_basic_auth',
-                      action='store_true', default=False,
-                      help='Requires Basic authentication.')
-    parser.add_option('--basic-auth-credential',
-                      dest='basic_auth_credential', default='test:test',
-                      help='Specifies the credential of basic authentication '
-                      'by username:password pair (e.g. test:test).')
-    parser.add_option('-l', '--log-file', '--log_file', dest='log_file',
-                      default='', help='Log file.')
-    # Custom log level:
-    # - FINE: Prints status of each frame processing step
-    parser.add_option('--log-level', '--log_level', type='choice',
-                      dest='log_level', default='warn',
-                      choices=['fine',
-                               'debug', 'info', 'warning', 'warn', 'error',
-                               'critical'],
-                      help='Log level.')
-    parser.add_option('--deflate-log-level', '--deflate_log_level',
-                      type='choice',
-                      dest='deflate_log_level', default='warn',
-                      choices=['debug', 'info', 'warning', 'warn', 'error',
-                               'critical'],
-                      help='Log level for _Deflater and _Inflater.')
-    parser.add_option('--thread-monitor-interval-in-sec',
-                      '--thread_monitor_interval_in_sec',
-                      dest='thread_monitor_interval_in_sec',
-                      type='int', default=-1,
-                      help=('If positive integer is specified, run a thread '
-                            'monitor to show the status of server threads '
-                            'periodically in the specified inteval in '
-                            'second. If non-positive integer is specified, '
-                            'disable the thread monitor.'))
-    parser.add_option('--log-max', '--log_max', dest='log_max', type='int',
-                      default=_DEFAULT_LOG_MAX_BYTES,
-                      help='Log maximum bytes')
-    parser.add_option('--log-count', '--log_count', dest='log_count',
-                      type='int', default=_DEFAULT_LOG_BACKUP_COUNT,
-                      help='Log backup count')
-    parser.add_option('--allow-draft75', dest='allow_draft75',
-                      action='store_true', default=False,
-                      help='Obsolete option. Ignored.')
-    parser.add_option('--strict', dest='strict', action='store_true',
-                      default=False, help='Obsolete option. Ignored.')
-    parser.add_option('-q', '--queue', dest='request_queue_size', type='int',
-                      default=_DEFAULT_REQUEST_QUEUE_SIZE,
-                      help='request queue size')
-
-    return parser
-
-
-class ThreadMonitor(threading.Thread):
-    daemon = True
-
-    def __init__(self, interval_in_sec):
-        threading.Thread.__init__(self, name='ThreadMonitor')
-
-        self._logger = util.get_class_logger(self)
-
-        self._interval_in_sec = interval_in_sec
-
-    def run(self):
-        while True:
-            thread_name_list = []
-            for thread in threading.enumerate():
-                thread_name_list.append(thread.name)
-            self._logger.info(
-                "%d active threads: %s",
-                threading.active_count(),
-                ', '.join(thread_name_list))
-            time.sleep(self._interval_in_sec)
-
-
-def _parse_args_and_config(args):
-    parser = _build_option_parser()
-
-    # First, parse options without configuration file.
-    temporary_options, temporary_args = parser.parse_args(args=args)
-    if temporary_args:
-        logging.critical(
-            'Unrecognized positional arguments: %r', temporary_args)
-        sys.exit(1)
-
-    if temporary_options.config_file:
-        try:
-            config_fp = open(temporary_options.config_file, 'r')
-        except IOError as e:
-            logging.critical(
-                'Failed to open configuration file %r: %r',
-                temporary_options.config_file,
-                e)
-            sys.exit(1)
-
-        config_parser = configparser.SafeConfigParser()
-        config_parser.readfp(config_fp)
-        config_fp.close()
-
-        args_from_config = []
-        for name, value in config_parser.items('pywebsocket'):
-            args_from_config.append('--' + name)
-            args_from_config.append(value)
-        if args is None:
-            args = args_from_config
-        else:
-            args = args_from_config + args
-        return parser.parse_args(args=args)
-    else:
-        return temporary_options, temporary_args
-
-
-def _main(args=None):
-    """You can call this function from your own program, but please note that
-    this function has some side-effects that might affect your program. For
-    example, util.wrap_popen3_for_win use in this method replaces implementation
-    of os.popen3.
-    """
-
-    options, args = _parse_args_and_config(args=args)
-
-    os.chdir(options.document_root)
-
-    _configure_logging(options)
-
-    if options.allow_draft75:
-        logging.warning('--allow_draft75 option is obsolete.')
-
-    if options.strict:
-        logging.warning('--strict option is obsolete.')
-
-    # TODO(tyoshino): Clean up initialization of CGI related values. Move some
-    # of code here to WebSocketRequestHandler class if it's better.
-    options.cgi_directories = []
-    options.is_executable_method = None
-    if options.cgi_paths:
-        options.cgi_directories = options.cgi_paths.split(',')
-        if sys.platform in ('cygwin', 'win32'):
-            cygwin_path = None
-            # For Win32 Python, it is expected that CYGWIN_PATH
-            # is set to a directory of cygwin binaries.
-            # For example, websocket_server.py in Chromium sets CYGWIN_PATH to
-            # full path of third_party/cygwin/bin.
-            if 'CYGWIN_PATH' in os.environ:
-                cygwin_path = os.environ['CYGWIN_PATH']
-            util.wrap_popen3_for_win(cygwin_path)
-
-            def __check_script(scriptpath):
-                return util.get_script_interp(scriptpath, cygwin_path)
-
-            options.is_executable_method = __check_script
-
-    if options.use_tls:
-        if options.tls_module is None:
-            if _import_ssl():
-                options.tls_module = _TLS_BY_STANDARD_MODULE
-                logging.debug('Using ssl module')
-            elif _import_pyopenssl():
-                options.tls_module = _TLS_BY_PYOPENSSL
-                logging.debug('Using pyOpenSSL module')
-            else:
-                logging.critical(
-                        'TLS support requires ssl or pyOpenSSL module.')
-                sys.exit(1)
-        elif options.tls_module == _TLS_BY_STANDARD_MODULE:
-            if not _import_ssl():
-                logging.critical('ssl module is not available')
-                sys.exit(1)
-        elif options.tls_module == _TLS_BY_PYOPENSSL:
-            if not _import_pyopenssl():
-                logging.critical('pyOpenSSL module is not available')
-                sys.exit(1)
-        else:
-            logging.critical('Invalid --tls-module option: %r',
-                             options.tls_module)
-            sys.exit(1)
-
-        if not options.private_key or not options.certificate:
-            logging.critical(
-                    'To use TLS, specify private_key and certificate.')
-            sys.exit(1)
-
-        if (options.tls_client_cert_optional and
-            not options.tls_client_auth):
-            logging.critical('Client authentication must be enabled to '
-                             'specify tls_client_cert_optional')
-            sys.exit(1)
-    else:
-        if options.tls_module is not None:
-            logging.critical('Use --tls-module option only together with '
-                             '--use-tls option.')
-            sys.exit(1)
-
-        if options.tls_client_auth:
-            logging.critical('TLS must be enabled for client authentication.')
-            sys.exit(1)
-
-        if options.tls_client_cert_optional:
-            logging.critical('TLS must be enabled for client authentication.')
-            sys.exit(1)
-
-    if not options.scan_dir:
-        options.scan_dir = options.websock_handlers
-
-    if options.use_basic_auth:
-        options.basic_auth_credential = 'Basic ' + base64.b64encode(
-            options.basic_auth_credential)
-
-    try:
-        if options.thread_monitor_interval_in_sec > 0:
-            # Run a thread monitor to show the status of server threads for
-            # debugging.
-            ThreadMonitor(options.thread_monitor_interval_in_sec).start()
-
-        server = WebSocketServer(options)
-        server.serve_forever()
-    except Exception as e:
-        logging.critical('mod_pywebsocket: %s' % e)
-        logging.critical('mod_pywebsocket: %s' % util.get_stack_trace())
-        sys.exit(1)
-
-
-if __name__ == '__main__':
-    _main(sys.argv[1:])
-
-
-# vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/stream.py b/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/stream.py
deleted file mode 100644
index a7d3136ac9b..00000000000
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/stream.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2011, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-"""This file exports public symbols."""
-
-
-from mod_pywebsocket._stream_base import BadOperationException
-from mod_pywebsocket._stream_base import ConnectionTerminatedException
-from mod_pywebsocket._stream_base import InvalidFrameException
-from mod_pywebsocket._stream_base import InvalidUTF8Exception
-from mod_pywebsocket._stream_base import UnsupportedFrameException
-from mod_pywebsocket._stream_hixie75 import StreamHixie75
-from mod_pywebsocket._stream_hybi import Frame
-from mod_pywebsocket._stream_hybi import Stream
-from mod_pywebsocket._stream_hybi import StreamOptions
-
-# These methods are intended to be used by WebSocket client developers to have
-# their implementations receive broken data in tests.
-from mod_pywebsocket._stream_hybi import create_close_frame
-from mod_pywebsocket._stream_hybi import create_header
-from mod_pywebsocket._stream_hybi import create_length_header
-from mod_pywebsocket._stream_hybi import create_ping_frame
-from mod_pywebsocket._stream_hybi import create_pong_frame
-from mod_pywebsocket._stream_hybi import create_binary_frame
-from mod_pywebsocket._stream_hybi import create_text_frame
-from mod_pywebsocket._stream_hybi import create_closing_handshake_body
-
-
-# vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/xhr_benchmark_handler.py b/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/xhr_benchmark_handler.py
deleted file mode 100644
index 43a5b049220..00000000000
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/xhr_benchmark_handler.py
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 2014 Google Inc. All rights reserved.
-#
-# Use of this source code is governed by a BSD-style
-# license that can be found in the COPYING file or at
-# https://developers.google.com/open-source/licenses/bsd
-
-
-from mod_pywebsocket import util
-
-
-class XHRBenchmarkHandler(object):
-    def __init__(self, headers, rfile, wfile):
-        self._logger = util.get_class_logger(self)
-
-        self.headers = headers
-        self.rfile = rfile
-        self.wfile = wfile
-
-    def do_send(self):
-        content_length = int(self.headers.getheader('Content-Length'))
-
-        self._logger.debug('Requested to receive %s bytes', content_length)
-
-        RECEIVE_BLOCK_SIZE = 1024 * 1024
-
-        bytes_to_receive = content_length
-        while bytes_to_receive > 0:
-            bytes_to_receive_in_this_loop = bytes_to_receive
-            if bytes_to_receive_in_this_loop > RECEIVE_BLOCK_SIZE:
-                bytes_to_receive_in_this_loop = RECEIVE_BLOCK_SIZE
-            received_data = self.rfile.read(bytes_to_receive_in_this_loop)
-            if received_data != ('a' * bytes_to_receive_in_this_loop):
-                self._logger.debug('Request body verification failed')
-                return
-            bytes_to_receive -= len(received_data)
-        if bytes_to_receive < 0:
-            self._logger.debug('Received %d more bytes than expected' %
-                               (-bytes_to_receive))
-            return
-
-        # Return the number of received bytes back to the client.
-        response_body = '%d' % content_length
-        self.wfile.write(
-            'HTTP/1.1 200 OK\r\n'
-            'Access-Control-Allow-Origin: *\r\n'
-            'Content-Type: text/html\r\n'
-            'Content-Length: %d\r\n'
-            '\r\n%s' % (len(response_body), response_body))
-        self.wfile.flush()
-
-    def do_receive_and_parse(self):
-        content_length = int(self.headers.getheader('Content-Length'))
-        request_body = self.rfile.read(content_length)
-
-        request_array = request_body.split(' ')
-        if len(request_array) < 2:
-            self._logger.debug('Malformed request body: %r', request_body)
-            return
-
-        # Parse the size parameter.
-        bytes_to_send = request_array[0]
-        try:
-            bytes_to_send = int(bytes_to_send)
-        except ValueError as e:
-            self._logger.debug('Malformed size parameter: %r', bytes_to_send)
-            return
-
-        # Parse the transfer encoding parameter.
-        chunked_mode = False
-        mode_parameter = request_array[1]
-        if mode_parameter == 'chunked':
-            self._logger.debug('Requested chunked transfer encoding')
-            chunked_mode = True
-        elif mode_parameter != 'none':
-            self._logger.debug('Invalid mode parameter: %r', mode_parameter)
-            return
-
-        self.do_receive(bytes_to_send, chunked_mode, False)
-
-    def do_receive(self, bytes_to_send, chunked_mode, enable_cache):
-        self._logger.debug(
-            'Requested to send %s bytes (chunked: %s, cache: %s)',
-            bytes_to_send, chunked_mode, enable_cache)
-        # Write a header
-        response_header = (
-            'HTTP/1.1 200 OK\r\n'
-            'Access-Control-Allow-Origin: *\r\n'
-            'Content-Type: application/octet-stream\r\n')
-        if enable_cache:
-            response_header += 'Cache-Control: private, max-age=10\r\n'
-        else:
-            response_header += \
-                'Cache-Control: no-cache, no-store, must-revalidate\r\n'
-        if chunked_mode:
-            response_header += 'Transfer-Encoding: chunked\r\n\r\n'
-        else:
-            response_header += (
-                'Content-Length: %d\r\n\r\n' % bytes_to_send)
-        self.wfile.write(response_header)
-        self.wfile.flush()
-
-        # Write a body
-        SEND_BLOCK_SIZE = 1024 * 1024
-
-        while bytes_to_send > 0:
-            bytes_to_send_in_this_loop = bytes_to_send
-            if bytes_to_send_in_this_loop > SEND_BLOCK_SIZE:
-                bytes_to_send_in_this_loop = SEND_BLOCK_SIZE
-
-            if chunked_mode:
-                self.wfile.write('%x\r\n' % bytes_to_send_in_this_loop)
-            self.wfile.write('a' * bytes_to_send_in_this_loop)
-            if chunked_mode:
-                self.wfile.write('\r\n')
-            self.wfile.flush()
-
-            bytes_to_send -= bytes_to_send_in_this_loop
-
-        if chunked_mode:
-            self.wfile.write('0\r\n\r\n')
-            self.wfile.flush()
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/test/client_for_testing.py b/tests/wpt/web-platform-tests/tools/pywebsocket/test/client_for_testing.py
deleted file mode 100644
index 18d185712ee..00000000000
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/test/client_for_testing.py
+++ /dev/null
@@ -1,1100 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2012, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-"""WebSocket client utility for testing.
-
-This module contains helper methods for performing handshake, frame
-sending/receiving as a WebSocket client.
-
-This is code for testing mod_pywebsocket. Keep this code independent from
-mod_pywebsocket. Don't import e.g. Stream class for generating frame for
-testing. Using util.hexify, etc. that are not related to protocol processing
-is allowed.
-
-Note:
-This code is far from robust, e.g., we cut corners in handshake.
-"""
-
-
-import base64
-import errno
-import logging
-import os
-import random
-import re
-import socket
-import struct
-import time
-
-from mod_pywebsocket import common
-from mod_pywebsocket import util
-
-
-DEFAULT_PORT = 80
-DEFAULT_SECURE_PORT = 443
-
-# Opcodes introduced in IETF HyBi 01 for the new framing format
-OPCODE_CONTINUATION = 0x0
-OPCODE_CLOSE = 0x8
-OPCODE_PING = 0x9
-OPCODE_PONG = 0xa
-OPCODE_TEXT = 0x1
-OPCODE_BINARY = 0x2
-
-# Strings used for handshake
-_UPGRADE_HEADER = 'Upgrade: websocket\r\n'
-_UPGRADE_HEADER_HIXIE75 = 'Upgrade: WebSocket\r\n'
-_CONNECTION_HEADER = 'Connection: Upgrade\r\n'
-
-WEBSOCKET_ACCEPT_UUID = '258EAFA5-E914-47DA-95CA-C5AB0DC85B11'
-
-# Status codes
-STATUS_NORMAL_CLOSURE = 1000
-STATUS_GOING_AWAY = 1001
-STATUS_PROTOCOL_ERROR = 1002
-STATUS_UNSUPPORTED_DATA = 1003
-STATUS_NO_STATUS_RECEIVED = 1005
-STATUS_ABNORMAL_CLOSURE = 1006
-STATUS_INVALID_FRAME_PAYLOAD_DATA = 1007
-STATUS_POLICY_VIOLATION = 1008
-STATUS_MESSAGE_TOO_BIG = 1009
-STATUS_MANDATORY_EXT = 1010
-STATUS_INTERNAL_ENDPOINT_ERROR = 1011
-STATUS_TLS_HANDSHAKE = 1015
-
-# Extension tokens
-_DEFLATE_FRAME_EXTENSION = 'deflate-frame'
-# TODO(bashi): Update after mux implementation finished.
-_MUX_EXTENSION = 'mux_DO_NOT_USE'
-_PERMESSAGE_DEFLATE_EXTENSION = 'permessage-deflate'
-
-def _method_line(resource):
-    return 'GET %s HTTP/1.1\r\n' % resource
-
-
-def _sec_origin_header(origin):
-    return 'Sec-WebSocket-Origin: %s\r\n' % origin.lower()
-
-
-def _origin_header(origin):
-    # 4.1 13. concatenation of the string "Origin:", a U+0020 SPACE character,
-    # and the /origin/ value, converted to ASCII lowercase, to /fields/.
-    return 'Origin: %s\r\n' % origin.lower()
-
-
-def _format_host_header(host, port, secure):
-    # 4.1 9. Let /hostport/ be an empty string.
-    # 4.1 10. Append the /host/ value, converted to ASCII lowercase, to
-    # /hostport/
-    hostport = host.lower()
-    # 4.1 11. If /secure/ is false, and /port/ is not 80, or if /secure/
-    # is true, and /port/ is not 443, then append a U+003A COLON character
-    # (:) followed by the value of /port/, expressed as a base-ten integer,
-    # to /hostport/
-    if ((not secure and port != DEFAULT_PORT) or
-        (secure and port != DEFAULT_SECURE_PORT)):
-        hostport += ':' + str(port)
-    # 4.1 12. concatenation of the string "Host:", a U+0020 SPACE
-    # character, and /hostport/, to /fields/.
-    return 'Host: %s\r\n' % hostport
-
-
-# TODO(tyoshino): Define a base class and move these shared methods to that.
-
-
-def receive_bytes(socket, length):
-    received_bytes = []
-    remaining = length
-    while remaining > 0:
-        new_received_bytes = socket.recv(remaining)
-        if not new_received_bytes:
-            raise Exception(
-                'Connection closed before receiving requested length '
-                '(requested %d bytes but received only %d bytes)' %
-                (length, length - remaining))
-        received_bytes.append(new_received_bytes)
-        remaining -= len(new_received_bytes)
-    return ''.join(received_bytes)
-
-
-# TODO(tyoshino): Now the WebSocketHandshake class diverts these methods. We
-# should move to HTTP parser as specified in RFC 6455. For HyBi 00 and
-# Hixie 75, pack these methods as some parser class.
-
-
-def _read_fields(socket):
-    # 4.1 32. let /fields/ be a list of name-value pairs, initially empty.
-    fields = {}
-    while True:
-        # 4.1 33. let /name/ and /value/ be empty byte arrays
-        name = ''
-        value = ''
-        # 4.1 34. read /name/
-        name = _read_name(socket)
-        if name is None:
-            break
-        # 4.1 35. read spaces
-        # TODO(tyoshino): Skip only one space as described in the spec.
-        ch = _skip_spaces(socket)
-        # 4.1 36. read /value/
-        value = _read_value(socket, ch)
-        # 4.1 37. read a byte from the server
-        ch = receive_bytes(socket, 1)
-        if ch != '\n':  # 0x0A
-            raise Exception(
-                'Expected LF but found %r while reading value %r for header '
-                '%r' % (ch, name, value))
-        # 4.1 38. append an entry to the /fields/ list that has the name
-        # given by the string obtained by interpreting the /name/ byte
-        # array as a UTF-8 stream and the value given by the string
-        # obtained by interpreting the /value/ byte array as a UTF-8 byte
-        # stream.
-        fields.setdefault(name, []).append(value)
-        # 4.1 39. return to the "Field" step above
-    return fields
-
-
-def _read_name(socket):
-    # 4.1 33. let /name/ be empty byte arrays
-    name = ''
-    while True:
-        # 4.1 34. read a byte from the server
-        ch = receive_bytes(socket, 1)
-        if ch == '\r':  # 0x0D
-            return None
-        elif ch == '\n':  # 0x0A
-            raise Exception(
-                'Unexpected LF when reading header name %r' % name)
-        elif ch == ':':  # 0x3A
-            return name
-        elif ch >= 'A' and ch <= 'Z':  # range 0x31 to 0x5A
-            ch = chr(ord(ch) + 0x20)
-            name += ch
-        else:
-            name += ch
-
-
-def _skip_spaces(socket):
-    # 4.1 35. read a byte from the server
-    while True:
-        ch = receive_bytes(socket, 1)
-        if ch == ' ':  # 0x20
-            continue
-        return ch
-
-
-def _read_value(socket, ch):
-    # 4.1 33. let /value/ be empty byte arrays
-    value = ''
-    # 4.1 36. read a byte from server.
-    while True:
-        if ch == '\r':  # 0x0D
-            return value
-        elif ch == '\n':  # 0x0A
-            raise Exception(
-                'Unexpected LF when reading header value %r' % value)
-        else:
-            value += ch
-        ch = receive_bytes(socket, 1)
-
-
-def read_frame_header(socket):
-    received = receive_bytes(socket, 2)
-
-    first_byte = ord(received[0])
-    fin = (first_byte >> 7) & 1
-    rsv1 = (first_byte >> 6) & 1
-    rsv2 = (first_byte >> 5) & 1
-    rsv3 = (first_byte >> 4) & 1
-    opcode = first_byte & 0xf
-
-    second_byte = ord(received[1])
-    mask = (second_byte >> 7) & 1
-    payload_length = second_byte & 0x7f
-
-    if mask != 0:
-        raise Exception(
-            'Mask bit must be 0 for frames coming from server')
-
-    if payload_length == 127:
-        extended_payload_length = receive_bytes(socket, 8)
-        payload_length = struct.unpack(
-            '!Q', extended_payload_length)[0]
-        if payload_length > 0x7FFFFFFFFFFFFFFF:
-            raise Exception('Extended payload length >= 2^63')
-    elif payload_length == 126:
-        extended_payload_length = receive_bytes(socket, 2)
-        payload_length = struct.unpack(
-            '!H', extended_payload_length)[0]
-
-    return fin, rsv1, rsv2, rsv3, opcode, payload_length
-
-
-class _TLSSocket(object):
-    """Wrapper for a TLS connection."""
-
-    def __init__(self, raw_socket):
-        self._ssl = socket.ssl(raw_socket)
-
-    def send(self, bytes):
-        return self._ssl.write(bytes)
-
-    def recv(self, size=-1):
-        return self._ssl.read(size)
-
-    def close(self):
-        # Nothing to do.
-        pass
-
-
-class HttpStatusException(Exception):
-    """This exception will be raised when unexpected http status code was
-    received as a result of handshake.
-    """
-
-    def __init__(self, name, status):
-        super(HttpStatusException, self).__init__(name)
-        self.status = status
-
-
-class WebSocketHandshake(object):
-    """Opening handshake processor for the WebSocket protocol (RFC 6455)."""
-
-    def __init__(self, options):
-        self._logger = util.get_class_logger(self)
-
-        self._options = options
-
-    def handshake(self, socket):
-        """Handshake WebSocket.
-
-        Raises:
-            Exception: handshake failed.
-        """
-
-        self._socket = socket
-
-        request_line = _method_line(self._options.resource)
-        self._logger.debug('Opening handshake Request-Line: %r', request_line)
-        self._socket.sendall(request_line)
-
-        fields = []
-        fields.append(_UPGRADE_HEADER)
-        fields.append(_CONNECTION_HEADER)
-
-        fields.append(_format_host_header(
-            self._options.server_host,
-            self._options.server_port,
-            self._options.use_tls))
-
-        if self._options.version == 8:
-            fields.append(_sec_origin_header(self._options.origin))
-        else:
-            fields.append(_origin_header(self._options.origin))
-
-        original_key = os.urandom(16)
-        key = base64.b64encode(original_key)
-        self._logger.debug(
-            'Sec-WebSocket-Key: %s (%s)', key, util.hexify(original_key))
-        fields.append('Sec-WebSocket-Key: %s\r\n' % key)
-
-        fields.append('Sec-WebSocket-Version: %d\r\n' % self._options.version)
-
-        # Setting up extensions.
-        if len(self._options.extensions) > 0:
-            fields.append('Sec-WebSocket-Extensions: %s\r\n' %
-                          ', '.join(self._options.extensions))
-
-        self._logger.debug('Opening handshake request headers: %r', fields)
-
-        for field in fields:
-            self._socket.sendall(field)
-        self._socket.sendall('\r\n')
-
-        self._logger.info('Sent opening handshake request')
-
-        field = ''
-        while True:
-            ch = receive_bytes(self._socket, 1)
-            field += ch
-            if ch == '\n':
-                break
-
-        self._logger.debug('Opening handshake Response-Line: %r', field)
-
-        if len(field) < 7 or not field.endswith('\r\n'):
-            raise Exception('Wrong status line: %r' % field)
-        m = re.match('[^ ]* ([^ ]*) .*', field)
-        if m is None:
-            raise Exception(
-                'No HTTP status code found in status line: %r' % field)
-        code = m.group(1)
-        if not re.match('[0-9][0-9][0-9]', code):
-            raise Exception(
-                'HTTP status code %r is not three digit in status line: %r' %
-                (code, field))
-        if code != '101':
-            raise HttpStatusException(
-                'Expected HTTP status code 101 but found %r in status line: '
-                '%r' % (code, field), int(code))
-        fields = _read_fields(self._socket)
-        ch = receive_bytes(self._socket, 1)
-        if ch != '\n':  # 0x0A
-            raise Exception('Expected LF but found: %r' % ch)
-
-        self._logger.debug('Opening handshake response headers: %r', fields)
-
-        # Check /fields/
-        if len(fields['upgrade']) != 1:
-            raise Exception(
-                'Multiple Upgrade headers found: %s' % fields['upgrade'])
-        if len(fields['connection']) != 1:
-            raise Exception(
-                'Multiple Connection headers found: %s' % fields['connection'])
-        if fields['upgrade'][0] != 'websocket':
-            raise Exception(
-                'Unexpected Upgrade header value: %s' % fields['upgrade'][0])
-        if fields['connection'][0].lower() != 'upgrade':
-            raise Exception(
-                'Unexpected Connection header value: %s' %
-                fields['connection'][0])
-
-        if len(fields['sec-websocket-accept']) != 1:
-            raise Exception(
-                'Multiple Sec-WebSocket-Accept headers found: %s' %
-                fields['sec-websocket-accept'])
-
-        accept = fields['sec-websocket-accept'][0]
-
-        # Validate
-        try:
-            decoded_accept = base64.b64decode(accept)
-        except TypeError as e:
-            raise HandshakeException(
-                'Illegal value for header Sec-WebSocket-Accept: ' + accept)
-
-        if len(decoded_accept) != 20:
-            raise HandshakeException(
-                'Decoded value of Sec-WebSocket-Accept is not 20-byte long')
-
-        self._logger.debug('Actual Sec-WebSocket-Accept: %r (%s)',
-                           accept, util.hexify(decoded_accept))
-
-        original_expected_accept = util.sha1_hash(
-            key + WEBSOCKET_ACCEPT_UUID).digest()
-        expected_accept = base64.b64encode(original_expected_accept)
-
-        self._logger.debug('Expected Sec-WebSocket-Accept: %r (%s)',
-                           expected_accept,
-                           util.hexify(original_expected_accept))
-
-        if accept != expected_accept:
-            raise Exception(
-                'Invalid Sec-WebSocket-Accept header: %r (expected) != %r '
-                '(actual)' % (accept, expected_accept))
-
-        server_extensions_header = fields.get('sec-websocket-extensions')
-        accepted_extensions = []
-        if server_extensions_header is not None:
-            accepted_extensions = common.parse_extensions(
-                    ', '.join(server_extensions_header))
-
-        # Scan accepted extension list to check if there is any unrecognized
-        # extensions or extensions we didn't request in it. Then, for
-        # extensions we request, parse them and store parameters. They will be
-        # used later by each extension.
-        deflate_frame_accepted = False
-        mux_accepted = False
-        for extension in accepted_extensions:
-            if extension.name() == _DEFLATE_FRAME_EXTENSION:
-                if self._options.use_deflate_frame:
-                    deflate_frame_accepted = True
-                    continue
-            if extension.name() == _MUX_EXTENSION:
-                if self._options.use_mux:
-                    mux_accepted = True
-                    continue
-            if extension.name() == _PERMESSAGE_DEFLATE_EXTENSION:
-                checker = self._options.check_permessage_deflate
-                if checker:
-                    checker(extension)
-                    continue
-
-            raise Exception(
-                'Received unrecognized extension: %s' % extension.name())
-
-        # Let all extensions check the response for extension request.
-
-        if (self._options.use_deflate_frame and
-            not deflate_frame_accepted):
-            raise Exception('%s extension not accepted' %
-                            _DEFLATE_FRAME_EXTENSION)
-
-        if self._options.use_mux and not mux_accepted:
-            raise Exception('%s extension not accepted' % _MUX_EXTENSION)
-
-
-class WebSocketHybi00Handshake(object):
-    """Opening handshake processor for the WebSocket protocol version HyBi 00.
-    """
-
-    def __init__(self, options, draft_field):
-        self._logger = util.get_class_logger(self)
-
-        self._options = options
-        self._draft_field = draft_field
-
-    def handshake(self, socket):
-        """Handshake WebSocket.
-
-        Raises:
-            Exception: handshake failed.
-        """
-
-        self._socket = socket
-
-        # 4.1 5. send request line.
-        request_line = _method_line(self._options.resource)
-        self._logger.debug('Opening handshake Request-Line: %r', request_line)
-        self._socket.sendall(request_line)
-        # 4.1 6. Let /fields/ be an empty list of strings.
-        fields = []
-        # 4.1 7. Add the string "Upgrade: WebSocket" to /fields/.
-        fields.append(_UPGRADE_HEADER_HIXIE75)
-        # 4.1 8. Add the string "Connection: Upgrade" to /fields/.
-        fields.append(_CONNECTION_HEADER)
-        # 4.1 9-12. Add Host: field to /fields/.
-        fields.append(_format_host_header(
-            self._options.server_host,
-            self._options.server_port,
-            self._options.use_tls))
-        # 4.1 13. Add Origin: field to /fields/.
-        fields.append(_origin_header(self._options.origin))
-        # TODO: 4.1 14 Add Sec-WebSocket-Protocol: field to /fields/.
-        # TODO: 4.1 15 Add cookie headers to /fields/.
-
-        # 4.1 16-23. Add Sec-WebSocket-Key<n> to /fields/.
-        self._number1, key1 = self._generate_sec_websocket_key()
-        self._logger.debug('Number1: %d', self._number1)
-        fields.append('Sec-WebSocket-Key1: %s\r\n' % key1)
-        self._number2, key2 = self._generate_sec_websocket_key()
-        self._logger.debug('Number2: %d', self._number1)
-        fields.append('Sec-WebSocket-Key2: %s\r\n' % key2)
-
-        fields.append('Sec-WebSocket-Draft: %s\r\n' % self._draft_field)
-
-        # 4.1 24. For each string in /fields/, in a random order: send the
-        # string, encoded as UTF-8, followed by a UTF-8 encoded U+000D CARRIAGE
-        # RETURN U+000A LINE FEED character pair (CRLF).
-        random.shuffle(fields)
-
-        self._logger.debug('Opening handshake request headers: %r', fields)
-        for field in fields:
-            self._socket.sendall(field)
-
-        # 4.1 25. send a UTF-8-encoded U+000D CARRIAGE RETURN U+000A LINE FEED
-        # character pair (CRLF).
-        self._socket.sendall('\r\n')
-        # 4.1 26. let /key3/ be a string consisting of eight random bytes (or
-        # equivalently, a random 64 bit integer encoded in a big-endian order).
-        self._key3 = self._generate_key3()
-        # 4.1 27. send /key3/ to the server.
-        self._socket.sendall(self._key3)
-        self._logger.debug(
-            'Key3: %r (%s)', self._key3, util.hexify(self._key3))
-
-        self._logger.info('Sent opening handshake request')
-
-        # 4.1 28. Read bytes from the server until either the connection
-        # closes, or a 0x0A byte is read. let /field/ be these bytes, including
-        # the 0x0A bytes.
-        field = ''
-        while True:
-            ch = receive_bytes(self._socket, 1)
-            field += ch
-            if ch == '\n':
-                break
-
-        self._logger.debug('Opening handshake Response-Line: %r', field)
-
-        # if /field/ is not at least seven bytes long, or if the last
-        # two bytes aren't 0x0D and 0x0A respectively, or if it does not
-        # contain at least two 0x20 bytes, then fail the WebSocket connection
-        # and abort these steps.
-        if len(field) < 7 or not field.endswith('\r\n'):
-            raise Exception('Wrong status line: %r' % field)
-        m = re.match('[^ ]* ([^ ]*) .*', field)
-        if m is None:
-            raise Exception('No code found in status line: %r' % field)
-        # 4.1 29. let /code/ be the substring of /field/ that starts from the
-        # byte after the first 0x20 byte, and ends with the byte before the
-        # second 0x20 byte.
-        code = m.group(1)
-        # 4.1 30. if /code/ is not three bytes long, or if any of the bytes in
-        # /code/ are not in the range 0x30 to 0x90, then fail the WebSocket
-        # connection and abort these steps.
-        if not re.match('[0-9][0-9][0-9]', code):
-            raise Exception(
-                'HTTP status code %r is not three digit in status line: %r' %
-                (code, field))
-        # 4.1 31. if /code/, interpreted as UTF-8, is "101", then move to the
-        # next step.
-        if code != '101':
-            raise HttpStatusException(
-                'Expected HTTP status code 101 but found %r in status line: '
-                '%r' % (code, field), int(code))
-        # 4.1 32-39. read fields into /fields/
-        fields = _read_fields(self._socket)
-
-        self._logger.debug('Opening handshake response headers: %r', fields)
-
-        # 4.1 40. _Fields processing_
-        # read a byte from server
-        ch = receive_bytes(self._socket, 1)
-        if ch != '\n':  # 0x0A
-            raise Exception('Expected LF but found %r' % ch)
-        # 4.1 41. check /fields/
-        if len(fields['upgrade']) != 1:
-            raise Exception(
-                'Multiple Upgrade headers found: %s' % fields['upgrade'])
-        if len(fields['connection']) != 1:
-            raise Exception(
-                'Multiple Connection headers found: %s' % fields['connection'])
-        if len(fields['sec-websocket-origin']) != 1:
-            raise Exception(
-                'Multiple Sec-WebSocket-Origin headers found: %s' %
-                fields['sec-sebsocket-origin'])
-        if len(fields['sec-websocket-location']) != 1:
-            raise Exception(
-                'Multiple Sec-WebSocket-Location headers found: %s' %
-                fields['sec-sebsocket-location'])
-        # TODO(ukai): protocol
-        # if the entry's name is "upgrade"
-        #  if the value is not exactly equal to the string "WebSocket",
-        #  then fail the WebSocket connection and abort these steps.
-        if fields['upgrade'][0] != 'WebSocket':
-            raise Exception(
-                'Unexpected Upgrade header value: %s' % fields['upgrade'][0])
-        # if the entry's name is "connection"
-        #  if the value, converted to ASCII lowercase, is not exactly equal
-        #  to the string "upgrade", then fail the WebSocket connection and
-        #  abort these steps.
-        if fields['connection'][0].lower() != 'upgrade':
-            raise Exception(
-                'Unexpected Connection header value: %s' %
-                fields['connection'][0])
-        # TODO(ukai): check origin, location, cookie, ..
-
-        # 4.1 42. let /challenge/ be the concatenation of /number_1/,
-        # expressed as a big endian 32 bit integer, /number_2/, expressed
-        # as big endian 32 bit integer, and the eight bytes of /key_3/ in the
-        # order they were sent on the wire.
-        challenge = struct.pack('!I', self._number1)
-        challenge += struct.pack('!I', self._number2)
-        challenge += self._key3
-
-        self._logger.debug(
-            'Challenge: %r (%s)', challenge, util.hexify(challenge))
-
-        # 4.1 43. let /expected/ be the MD5 fingerprint of /challenge/ as a
-        # big-endian 128 bit string.
-        expected = util.md5_hash(challenge).digest()
-        self._logger.debug(
-            'Expected challenge response: %r (%s)',
-            expected, util.hexify(expected))
-
-        # 4.1 44. read sixteen bytes from the server.
-        # let /reply/ be those bytes.
-        reply = receive_bytes(self._socket, 16)
-        self._logger.debug(
-            'Actual challenge response: %r (%s)', reply, util.hexify(reply))
-
-        # 4.1 45. if /reply/ does not exactly equal /expected/, then fail
-        # the WebSocket connection and abort these steps.
-        if expected != reply:
-            raise Exception(
-                'Bad challenge response: %r (expected) != %r (actual)' %
-                (expected, reply))
-        # 4.1 46. The *WebSocket connection is established*.
-
-    def _generate_sec_websocket_key(self):
-        # 4.1 16. let /spaces_n/ be a random integer from 1 to 12 inclusive.
-        spaces = random.randint(1, 12)
-        # 4.1 17. let /max_n/ be the largest integer not greater than
-        #  4,294,967,295 divided by /spaces_n/.
-        maxnum = 4294967295 / spaces
-        # 4.1 18. let /number_n/ be a random integer from 0 to /max_n/
-        # inclusive.
-        number = random.randint(0, maxnum)
-        # 4.1 19. let /product_n/ be the result of multiplying /number_n/ and
-        # /spaces_n/ together.
-        product = number * spaces
-        # 4.1 20. let /key_n/ be a string consisting of /product_n/, expressed
-        # in base ten using the numerals in the range U+0030 DIGIT ZERO (0) to
-        # U+0039 DIGIT NINE (9).
-        key = str(product)
-        # 4.1 21. insert between one and twelve random characters from the
-        # range U+0021 to U+002F and U+003A to U+007E into /key_n/ at random
-        # positions.
-        available_chars = range(0x21, 0x2f + 1) + range(0x3a, 0x7e + 1)
-        n = random.randint(1, 12)
-        for _ in xrange(n):
-            ch = random.choice(available_chars)
-            pos = random.randint(0, len(key))
-            key = key[0:pos] + chr(ch) + key[pos:]
-        # 4.1 22. insert /spaces_n/ U+0020 SPACE characters into /key_n/ at
-        # random positions other than start or end of the string.
-        for _ in xrange(spaces):
-            pos = random.randint(1, len(key) - 1)
-            key = key[0:pos] + ' ' + key[pos:]
-        return number, key
-
-    def _generate_key3(self):
-        # 4.1 26. let /key3/ be a string consisting of eight random bytes (or
-        # equivalently, a random 64 bit integer encoded in a big-endian order).
-        return ''.join([chr(random.randint(0, 255)) for _ in xrange(8)])
-
-
-class WebSocketHixie75Handshake(object):
-    """WebSocket handshake processor for IETF Hixie 75."""
-
-    _EXPECTED_RESPONSE = (
-        'HTTP/1.1 101 Web Socket Protocol Handshake\r\n' +
-        _UPGRADE_HEADER_HIXIE75 +
-        _CONNECTION_HEADER)
-
-    def __init__(self, options):
-        self._logger = util.get_class_logger(self)
-
-        self._options = options
-
-    def _skip_headers(self):
-        terminator = '\r\n\r\n'
-        pos = 0
-        while pos < len(terminator):
-            received = receive_bytes(self._socket, 1)
-            if received == terminator[pos]:
-                pos += 1
-            elif received == terminator[0]:
-                pos = 1
-            else:
-                pos = 0
-
-    def handshake(self, socket):
-        self._socket = socket
-
-        request_line = _method_line(self._options.resource)
-        self._logger.debug('Opening handshake Request-Line: %r', request_line)
-        self._socket.sendall(request_line)
-
-        headers = _UPGRADE_HEADER_HIXIE75 + _CONNECTION_HEADER
-        headers += _format_host_header(
-            self._options.server_host,
-            self._options.server_port,
-            self._options.use_tls)
-        headers += _origin_header(self._options.origin)
-        self._logger.debug('Opening handshake request headers: %r', headers)
-        self._socket.sendall(headers)
-
-        self._socket.sendall('\r\n')
-
-        self._logger.info('Sent opening handshake request')
-
-        for expected_char in WebSocketHixie75Handshake._EXPECTED_RESPONSE:
-            received = receive_bytes(self._socket, 1)
-            if expected_char != received:
-                raise Exception('Handshake failure')
-        # We cut corners and skip other headers.
-        self._skip_headers()
-
-
-class WebSocketStream(object):
-    """Frame processor for the WebSocket protocol (RFC 6455)."""
-
-    def __init__(self, socket, handshake):
-        self._handshake = handshake
-        self._socket = socket
-
-        # Filters applied to application data part of data frames.
-        self._outgoing_frame_filter = None
-        self._incoming_frame_filter = None
-
-        if self._handshake._options.use_deflate_frame:
-            self._outgoing_frame_filter = (
-                util._RFC1979Deflater(None, False))
-            self._incoming_frame_filter = util._RFC1979Inflater()
-
-        self._fragmented = False
-
-    def _mask_hybi(self, s):
-        # TODO(tyoshino): os.urandom does open/read/close for every call. If
-        # performance matters, change this to some library call that generates
-        # cryptographically secure pseudo random number sequence.
-        masking_nonce = os.urandom(4)
-        result = [masking_nonce]
-        count = 0
-        for c in s:
-            result.append(chr(ord(c) ^ ord(masking_nonce[count])))
-            count = (count + 1) % len(masking_nonce)
-        return ''.join(result)
-
-    def send_frame_of_arbitrary_bytes(self, header, body):
-        self._socket.sendall(header + self._mask_hybi(body))
-
-    def send_data(self, payload, frame_type, end=True, mask=True,
-                  rsv1=0, rsv2=0, rsv3=0):
-        if self._outgoing_frame_filter is not None:
-            payload = self._outgoing_frame_filter.filter(payload)
-
-        if self._fragmented:
-            opcode = OPCODE_CONTINUATION
-        else:
-            opcode = frame_type
-
-        if end:
-            self._fragmented = False
-            fin = 1
-        else:
-            self._fragmented = True
-            fin = 0
-
-        if self._handshake._options.use_deflate_frame:
-            rsv1 = 1
-
-        if mask:
-            mask_bit = 1 << 7
-        else:
-            mask_bit = 0
-
-        header = chr(fin << 7 | rsv1 << 6 | rsv2 << 5 | rsv3 << 4 | opcode)
-        payload_length = len(payload)
-        if payload_length <= 125:
-            header += chr(mask_bit | payload_length)
-        elif payload_length < 1 << 16:
-            header += chr(mask_bit | 126) + struct.pack('!H', payload_length)
-        elif payload_length < 1 << 63:
-            header += chr(mask_bit | 127) + struct.pack('!Q', payload_length)
-        else:
-            raise Exception('Too long payload (%d byte)' % payload_length)
-        if mask:
-            payload = self._mask_hybi(payload)
-        self._socket.sendall(header + payload)
-
-    def send_binary(self, payload, end=True, mask=True):
-        self.send_data(payload, OPCODE_BINARY, end, mask)
-
-    def send_text(self, payload, end=True, mask=True):
-        self.send_data(payload.encode('utf-8'), OPCODE_TEXT, end, mask)
-
-    def _assert_receive_data(self, payload, opcode, fin, rsv1, rsv2, rsv3):
-        (actual_fin, actual_rsv1, actual_rsv2, actual_rsv3, actual_opcode,
-         payload_length) = read_frame_header(self._socket)
-
-        if actual_opcode != opcode:
-            raise Exception(
-                'Unexpected opcode: %d (expected) vs %d (actual)' %
-                (opcode, actual_opcode))
-
-        if actual_fin != fin:
-            raise Exception(
-                'Unexpected fin: %d (expected) vs %d (actual)' %
-                (fin, actual_fin))
-
-        if rsv1 is None:
-            rsv1 = 0
-            if self._handshake._options.use_deflate_frame:
-                rsv1 = 1
-
-        if rsv2 is None:
-            rsv2 = 0
-
-        if rsv3 is None:
-            rsv3 = 0
-
-        if actual_rsv1 != rsv1:
-            raise Exception(
-                'Unexpected rsv1: %r (expected) vs %r (actual)' %
-                (rsv1, actual_rsv1))
-
-        if actual_rsv2 != rsv2:
-            raise Exception(
-                'Unexpected rsv2: %r (expected) vs %r (actual)' %
-                (rsv2, actual_rsv2))
-
-        if actual_rsv3 != rsv3:
-            raise Exception(
-                'Unexpected rsv3: %r (expected) vs %r (actual)' %
-                (rsv3, actual_rsv3))
-
-        received = receive_bytes(self._socket, payload_length)
-
-        if self._incoming_frame_filter is not None:
-            received = self._incoming_frame_filter.filter(received)
-
-        if len(received) != len(payload):
-            raise Exception(
-                'Unexpected payload length: %d (expected) vs %d (actual)' %
-                (len(payload), len(received)))
-
-        if payload != received:
-            raise Exception(
-                'Unexpected payload: %r (expected) vs %r (actual)' %
-                (payload, received))
-
-    def assert_receive_binary(self, payload, opcode=OPCODE_BINARY, fin=1,
-                              rsv1=None, rsv2=None, rsv3=None):
-        self._assert_receive_data(payload, opcode, fin, rsv1, rsv2, rsv3)
-
-    def assert_receive_text(self, payload, opcode=OPCODE_TEXT, fin=1,
-                            rsv1=None, rsv2=None, rsv3=None):
-        self._assert_receive_data(payload.encode('utf-8'), opcode, fin, rsv1,
-                                  rsv2, rsv3)
-
-    def _build_close_frame(self, code, reason, mask):
-        frame = chr(1 << 7 | OPCODE_CLOSE)
-
-        if code is not None:
-            body = struct.pack('!H', code) + reason.encode('utf-8')
-        else:
-            body = ''
-        if mask:
-            frame += chr(1 << 7 | len(body)) + self._mask_hybi(body)
-        else:
-            frame += chr(len(body)) + body
-        return frame
-
-    def send_close(self, code, reason):
-        self._socket.sendall(
-            self._build_close_frame(code, reason, True))
-
-    def assert_receive_close(self, code, reason):
-        expected_frame = self._build_close_frame(code, reason, False)
-        actual_frame = receive_bytes(self._socket, len(expected_frame))
-        if actual_frame != expected_frame:
-            raise Exception(
-                'Unexpected close frame: %r (expected) vs %r (actual)' %
-                (expected_frame, actual_frame))
-
-
-class WebSocketStreamHixie75(object):
-    """Frame processor for the WebSocket protocol version Hixie 75 and HyBi 00.
-    """
-
-    _CLOSE_FRAME = '\xff\x00'
-
-    def __init__(self, socket, unused_handshake):
-        self._socket = socket
-
-    def send_frame_of_arbitrary_bytes(self, header, body):
-        self._socket.sendall(header + body)
-
-    def send_data(self, payload, unused_frame_typem, unused_end, unused_mask):
-        frame = ''.join(['\x00', payload, '\xff'])
-        self._socket.sendall(frame)
-
-    def send_binary(self, unused_payload, unused_end, unused_mask):
-        pass
-
-    def send_text(self, payload, unused_end, unused_mask):
-        encoded_payload = payload.encode('utf-8')
-        frame = ''.join(['\x00', encoded_payload, '\xff'])
-        self._socket.sendall(frame)
-
-    def assert_receive_binary(self, payload, opcode=OPCODE_BINARY, fin=1,
-                              rsv1=0, rsv2=0, rsv3=0):
-        raise Exception('Binary frame is not supported in hixie75')
-
-    def assert_receive_text(self, payload):
-        received = receive_bytes(self._socket, 1)
-
-        if received != '\x00':
-            raise Exception(
-                'Unexpected frame type: %d (expected) vs %d (actual)' %
-                (0, ord(received)))
-
-        received = receive_bytes(self._socket, len(payload) + 1)
-        if received[-1] != '\xff':
-            raise Exception(
-                'Termination expected: 0xff (expected) vs %r (actual)' %
-                received)
-
-        if received[0:-1] != payload:
-            raise Exception(
-                'Unexpected payload: %r (expected) vs %r (actual)' %
-                (payload, received[0:-1]))
-
-    def send_close(self, code, reason):
-        self._socket.sendall(self._CLOSE_FRAME)
-
-    def assert_receive_close(self, unused_code, unused_reason):
-        closing = receive_bytes(self._socket, len(self._CLOSE_FRAME))
-        if closing != self._CLOSE_FRAME:
-            raise Exception('Didn\'t receive closing handshake')
-
-
-class ClientOptions(object):
-    """Holds option values to configure the Client object."""
-
-    def __init__(self):
-        self.version = 13
-        self.server_host = ''
-        self.origin = ''
-        self.resource = ''
-        self.server_port = -1
-        self.socket_timeout = 1000
-        self.use_tls = False
-        self.extensions = []
-        # Enable deflate-application-data.
-        self.use_deflate_frame = False
-        # Enable mux
-        self.use_mux = False
-
-    def enable_deflate_frame(self):
-        self.use_deflate_frame = True
-        self.extensions.append(_DEFLATE_FRAME_EXTENSION)
-
-    def enable_mux(self):
-        self.use_mux = True
-        self.extensions.append(_MUX_EXTENSION)
-
-
-def connect_socket_with_retry(host, port, timeout, use_tls,
-                              retry=10, sleep_sec=0.1):
-    retry_count = 0
-    while retry_count < retry:
-        try:
-            s = socket.socket()
-            s.settimeout(timeout)
-            s.connect((host, port))
-            if use_tls:
-                return _TLSSocket(s)
-            return s
-        except socket.error as e:
-            if e.errno != errno.ECONNREFUSED:
-                raise
-            else:
-                retry_count = retry_count + 1
-                time.sleep(sleep_sec)
-
-    return None
-
-
-class Client(object):
-    """WebSocket client."""
-
-    def __init__(self, options, handshake, stream_class):
-        self._logger = util.get_class_logger(self)
-
-        self._options = options
-        self._socket = None
-
-        self._handshake = handshake
-        self._stream_class = stream_class
-
-    def connect(self):
-        self._socket = connect_socket_with_retry(
-                self._options.server_host,
-                self._options.server_port,
-                self._options.socket_timeout,
-                self._options.use_tls)
-
-        self._handshake.handshake(self._socket)
-
-        self._stream = self._stream_class(self._socket, self._handshake)
-
-        self._logger.info('Connection established')
-
-    def send_frame_of_arbitrary_bytes(self, header, body):
-        self._stream.send_frame_of_arbitrary_bytes(header, body)
-
-    def send_message(self, message, end=True, binary=False, raw=False,
-                     mask=True):
-        if binary:
-            self._stream.send_binary(message, end, mask)
-        elif raw:
-            self._stream.send_data(message, OPCODE_TEXT, end, mask)
-        else:
-            self._stream.send_text(message, end, mask)
-
-    def assert_receive(self, payload, binary=False):
-        if binary:
-            self._stream.assert_receive_binary(payload)
-        else:
-            self._stream.assert_receive_text(payload)
-
-    def send_close(self, code=STATUS_NORMAL_CLOSURE, reason=''):
-        self._stream.send_close(code, reason)
-
-    def assert_receive_close(self, code=STATUS_NORMAL_CLOSURE, reason=''):
-        self._stream.assert_receive_close(code, reason)
-
-    def close_socket(self):
-        self._socket.close()
-
-    def assert_connection_closed(self):
-        try:
-            read_data = receive_bytes(self._socket, 1)
-        except Exception as e:
-            if str(e).find(
-                'Connection closed before receiving requested length ') == 0:
-                return
-            try:
-                error_number, message = e
-                for error_name in ['ECONNRESET', 'WSAECONNRESET']:
-                    if (error_name in dir(errno) and
-                        error_number == getattr(errno, error_name)):
-                        return
-            except:
-                raise e
-            raise e
-
-        raise Exception('Connection is not closed (Read: %r)' % read_data)
-
-
-def create_client(options):
-    return Client(
-        options, WebSocketHandshake(options), WebSocketStream)
-
-
-def create_client_hybi00(options):
-    return Client(
-        options,
-        WebSocketHybi00Handshake(options, '0'),
-        WebSocketStreamHixie75)
-
-
-def create_client_hixie75(options):
-    return Client(
-        options, WebSocketHixie75Handshake(options), WebSocketStreamHixie75)
-
-
-# vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/test/mux_client_for_testing.py b/tests/wpt/web-platform-tests/tools/pywebsocket/test/mux_client_for_testing.py
deleted file mode 100644
index 304e7fc95d3..00000000000
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/test/mux_client_for_testing.py
+++ /dev/null
@@ -1,690 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2012, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-"""WebSocket client utility for testing mux extension.
-
-This code should be independent from mod_pywebsocket. See the comment of
-client_for_testing.py.
-
-NOTE: This code is far from robust like client_for_testing.py.
-"""
-
-
-
-import Queue
-import base64
-import collections
-import email
-import email.parser
-import logging
-import math
-import os
-import random
-import socket
-import struct
-import threading
-
-from mod_pywebsocket import util
-
-from test import client_for_testing
-
-
-_CONTROL_CHANNEL_ID = 0
-_DEFAULT_CHANNEL_ID = 1
-
-_MUX_OPCODE_ADD_CHANNEL_REQUEST = 0
-_MUX_OPCODE_ADD_CHANNEL_RESPONSE = 1
-_MUX_OPCODE_FLOW_CONTROL = 2
-_MUX_OPCODE_DROP_CHANNEL = 3
-_MUX_OPCODE_NEW_CHANNEL_SLOT = 4
-
-
-class _ControlBlock:
-    def __init__(self, opcode):
-        self.opcode = opcode
-
-
-def _parse_handshake_response(response):
-    status_line, header_lines = response.split('\r\n', 1)
-
-    words = status_line.split(' ')
-    if len(words) < 3:
-        raise ValueError('Bad Status-Line syntax %r' % status_line)
-    [version, response_code] = words[:2]
-    if version != 'HTTP/1.1':
-        raise ValueError('Bad response version %r' % version)
-
-    if response_code != '101':
-        raise ValueError('Bad response code %r ' % response_code)
-    headers = email.parser.Parser().parsestr(header_lines)
-    return headers
-
-
-def _parse_channel_id(data, offset=0):
-    length = len(data)
-    remaining = length - offset
-
-    if remaining <= 0:
-        raise Exception('No channel id found')
-
-    channel_id = ord(data[offset])
-    channel_id_length = 1
-    if channel_id & 0xe0 == 0xe0:
-        if remaining < 4:
-            raise Exception('Invalid channel id format')
-        channel_id = struct.unpack('!L',
-                                   data[offset:offset+4])[0] & 0x1fffffff
-        channel_id_length = 4
-    elif channel_id & 0xc0 == 0xc0:
-        if remaining < 3:
-            raise Exception('Invalid channel id format')
-        channel_id = (((channel_id & 0x1f) << 16) +
-                      struct.unpack('!H', data[offset+1:offset+3])[0])
-        channel_id_length = 3
-    elif channel_id & 0x80 == 0x80:
-        if remaining < 2:
-            raise Exception('Invalid channel id format')
-        channel_id = struct.unpack('!H', data[offset:offset+2])[0] & 0x3fff
-        channel_id_length = 2
-
-    return channel_id, channel_id_length
-
-
-def _parse_number(data, offset=0):
-    first_byte = ord(data[offset])
-    if (first_byte & 0x80) != 0:
-        raise Exception('The MSB of number field must be unset')
-    first_byte = first_byte & 0x7f
-    if first_byte == 127:
-        if offset + 9 > len(data):
-            raise Exception('Invalid number')
-        return struct.unpack('!Q', data[offset+1:offset+9])[0], 9
-    if first_byte == 126:
-        if offset + 3 > len(data):
-            raise Exception('Invalid number')
-        return struct.unpack('!H', data[offset+1:offset+3])[0], 3
-    return first_byte, 1
-
-
-def _parse_size_and_contents(data, offset=0):
-    size, advance = _parse_number(data, offset)
-    start_position = offset + advance
-    end_position = start_position + size
-    if len(data) < end_position:
-        raise Exception('Invalid size of control block (%d < %d)' % (
-                len(data), end_position))
-    return data[start_position:end_position], size + advance
-
-
-def _parse_control_blocks(data):
-    blocks = []
-    length = len(data)
-    pos = 0
-
-    while pos < length:
-        first_byte = ord(data[pos])
-        pos += 1
-        opcode = (first_byte >> 5) & 0x7
-        block = _ControlBlock(opcode)
-
-        # TODO(bashi): Support more opcode
-        if opcode == _MUX_OPCODE_ADD_CHANNEL_RESPONSE:
-            block.encode = first_byte & 3
-            block.rejected = (first_byte >> 4) & 1
-
-            channel_id, advance = _parse_channel_id(data, pos)
-            block.channel_id = channel_id
-            pos += advance
-
-            encoded_handshake, advance = _parse_size_and_contents(data, pos)
-            block.encoded_handshake = encoded_handshake
-            pos += advance
-            blocks.append(block)
-        elif opcode == _MUX_OPCODE_DROP_CHANNEL:
-            block.mux_error = (first_byte >> 4) & 1
-
-            channel_id, advance = _parse_channel_id(data, pos)
-            block.channel_id = channel_id
-            pos += advance
-
-            reason, advance = _parse_size_and_contents(data, pos)
-            if len(reason) == 0:
-                block.drop_code = None
-                block.drop_message = ''
-            elif len(reason) >= 2:
-                block.drop_code = struct.unpack('!H', reason[:2])[0]
-                block.drop_message = reason[2:]
-            else:
-                raise Exception('Invalid DropChannel')
-            pos += advance
-            blocks.append(block)
-        elif opcode == _MUX_OPCODE_FLOW_CONTROL:
-            channel_id, advance = _parse_channel_id(data, pos)
-            block.channel_id = channel_id
-            pos += advance
-            send_quota, advance = _parse_number(data, pos)
-            block.send_quota = send_quota
-            pos += advance
-            blocks.append(block)
-        elif opcode == _MUX_OPCODE_NEW_CHANNEL_SLOT:
-            fallback = first_byte & 1
-            slots, advance = _parse_number(data, pos)
-            pos += advance
-            send_quota, advance = _parse_number(data, pos)
-            pos += advance
-            if fallback == 1 and (slots != 0 or send_quota != 0):
-                raise Exception('slots and send_quota must be zero if F bit '
-                                'is set')
-            block.fallback = fallback
-            block.slots = slots
-            block.send_quota = send_quota
-            blocks.append(block)
-        else:
-            raise Exception(
-                'Unsupported mux opcode %d received' % opcode)
-
-    return blocks
-
-
-def _encode_channel_id(channel_id):
-    if channel_id < 0:
-        raise ValueError('Channel id %d must not be negative' % channel_id)
-
-    if channel_id < 2 ** 7:
-        return chr(channel_id)
-    if channel_id < 2 ** 14:
-        return struct.pack('!H', 0x8000 + channel_id)
-    if channel_id < 2 ** 21:
-        first = chr(0xc0 + (channel_id >> 16))
-        return first + struct.pack('!H', channel_id & 0xffff)
-    if channel_id < 2 ** 29:
-        return struct.pack('!L', 0xe0000000 + channel_id)
-
-    raise ValueError('Channel id %d is too large' % channel_id)
-
-
-def _encode_number(number):
-    if number <= 125:
-        return chr(number)
-    elif number < (1 << 16):
-        return chr(0x7e) + struct.pack('!H', number)
-    elif number < (1 << 63):
-        return chr(0x7f) + struct.pack('!Q', number)
-    else:
-        raise Exception('Invalid number')
-
-
-def _create_add_channel_request(channel_id, encoded_handshake,
-                                encoding=0):
-    length = len(encoded_handshake)
-    handshake_length = _encode_number(length)
-
-    first_byte = (_MUX_OPCODE_ADD_CHANNEL_REQUEST << 5) | encoding
-    return (chr(first_byte) + _encode_channel_id(channel_id) +
-            handshake_length + encoded_handshake)
-
-
-def _create_flow_control(channel_id, replenished_quota):
-    first_byte = (_MUX_OPCODE_FLOW_CONTROL << 5)
-    return (chr(first_byte) + _encode_channel_id(channel_id) +
-            _encode_number(replenished_quota))
-
-
-class _MuxReaderThread(threading.Thread):
-    """Mux reader thread.
-
-    Reads frames and passes them to the mux client. This thread accesses
-    private functions/variables of the mux client.
-    """
-
-    def __init__(self, mux):
-        threading.Thread.__init__(self)
-        self.setDaemon(True)
-        self._mux = mux
-        self._stop_requested = False
-
-    def _receive_message(self):
-        first_opcode = None
-        pending_payload = []
-        while not self._stop_requested:
-            fin, rsv1, rsv2, rsv3, opcode, payload_length = (
-                client_for_testing.read_frame_header(self._mux._socket))
-
-            if not first_opcode:
-                if opcode == client_for_testing.OPCODE_TEXT:
-                    raise Exception('Received a text message on physical '
-                                    'connection')
-                if opcode == client_for_testing.OPCODE_CONTINUATION:
-                    raise Exception('Received an intermediate frame but '
-                                    'fragmentation was not started')
-                if (opcode == client_for_testing.OPCODE_BINARY or
-                    opcode == client_for_testing.OPCODE_PONG or
-                    opcode == client_for_testing.OPCODE_PONG or
-                    opcode == client_for_testing.OPCODE_CLOSE):
-                    first_opcode = opcode
-                else:
-                    raise Exception('Received an undefined opcode frame: %d' %
-                                    opcode)
-
-            elif opcode != client_for_testing.OPCODE_CONTINUATION:
-                raise Exception('Received a new opcode before '
-                                'terminating fragmentation')
-
-            payload = client_for_testing.receive_bytes(
-                self._mux._socket, payload_length)
-
-            if self._mux._incoming_frame_filter is not None:
-                payload = self._mux._incoming_frame_filter.filter(payload)
-
-            pending_payload.append(payload)
-
-            if fin:
-                break
-
-        if self._stop_requested:
-            return None, None
-
-        message = ''.join(pending_payload)
-        return first_opcode, message
-
-    def request_stop(self):
-        self._stop_requested = True
-
-    def run(self):
-        try:
-            while not self._stop_requested:
-                # opcode is OPCODE_BINARY or control opcodes when a message
-                # is succesfully received.
-                opcode, message = self._receive_message()
-                if not opcode:
-                    return
-                if opcode == client_for_testing.OPCODE_BINARY:
-                    channel_id, advance = _parse_channel_id(message)
-                    self._mux._dispatch_frame(channel_id, message[advance:])
-                else:
-                    self._mux._process_control_message(opcode, message)
-        finally:
-            self._mux._notify_reader_done()
-
-
-class _InnerFrame(object):
-    def __init__(self, fin, rsv1, rsv2, rsv3, opcode, payload):
-        self.fin = fin
-        self.rsv1 = rsv1
-        self.rsv2 = rsv2
-        self.rsv3 = rsv3
-        self.opcode = opcode
-        self.payload = payload
-
-
-class _LogicalChannelData(object):
-    def __init__(self):
-        self.queue = Queue.Queue()
-        self.send_quota = 0
-        self.receive_quota = 0
-
-
-class MuxClient(object):
-    """WebSocket mux client.
-
-    Note that this class is NOT thread-safe. Do not access an instance of this
-    class from multiple threads at a same time.
-    """
-
-    def __init__(self, options):
-        self._logger = util.get_class_logger(self)
-
-        self._options = options
-        self._options.enable_mux()
-        self._stream = None
-        self._socket = None
-        self._handshake = client_for_testing.WebSocketHandshake(self._options)
-        self._incoming_frame_filter = None
-        self._outgoing_frame_filter = None
-
-        self._is_active = False
-        self._read_thread = None
-        self._control_blocks_condition = threading.Condition()
-        self._control_blocks = []
-        self._channel_slots = collections.deque()
-        self._logical_channels_condition = threading.Condition();
-        self._logical_channels = {}
-        self._timeout = 2
-        self._physical_connection_close_event = None
-        self._physical_connection_close_message = None
-
-    def _parse_inner_frame(self, data):
-        if len(data) == 0:
-            raise Exception('Invalid encapsulated frame received')
-
-        first_byte = ord(data[0])
-        fin = (first_byte << 7) & 1
-        rsv1 = (first_byte << 6) & 1
-        rsv2 = (first_byte << 5) & 1
-        rsv3 = (first_byte << 4) & 1
-        opcode = first_byte & 0xf
-
-        if self._outgoing_frame_filter:
-            payload = self._outgoing_frame_filter.filter(
-                data[1:])
-        else:
-            payload = data[1:]
-
-        return _InnerFrame(fin, rsv1, rsv2, rsv3, opcode, payload)
-
-    def _process_mux_control_blocks(self):
-        for block in self._control_blocks:
-            if block.opcode == _MUX_OPCODE_ADD_CHANNEL_RESPONSE:
-                # AddChannelResponse will be handled in add_channel().
-                continue
-            elif block.opcode == _MUX_OPCODE_FLOW_CONTROL:
-                try:
-                    self._logical_channels_condition.acquire()
-                    if not block.channel_id in self._logical_channels:
-                        raise Exception('Invalid flow control received for '
-                                        'channel id %d' % block.channel_id)
-                    self._logical_channels[block.channel_id].send_quota += (
-                        block.send_quota)
-                    self._logical_channels_condition.notify()
-                finally:
-                    self._logical_channels_condition.release()
-            elif block.opcode == _MUX_OPCODE_NEW_CHANNEL_SLOT:
-                self._channel_slots.extend([block.send_quota] * block.slots)
-
-    def _dispatch_frame(self, channel_id, payload):
-        if channel_id == _CONTROL_CHANNEL_ID:
-            try:
-                self._control_blocks_condition.acquire()
-                self._control_blocks += _parse_control_blocks(payload)
-                self._process_mux_control_blocks()
-                self._control_blocks_condition.notify()
-            finally:
-                self._control_blocks_condition.release()
-        else:
-            try:
-                self._logical_channels_condition.acquire()
-                if not channel_id in self._logical_channels:
-                    raise Exception('Received logical frame on channel id '
-                                    '%d, which is not established' %
-                                    channel_id)
-
-                inner_frame = self._parse_inner_frame(payload)
-                self._logical_channels[channel_id].receive_quota -= (
-                        len(inner_frame.payload))
-                if self._logical_channels[channel_id].receive_quota < 0:
-                    raise Exception('The server violates quota on '
-                                    'channel id %d' % channel_id)
-            finally:
-                self._logical_channels_condition.release()
-            self._logical_channels[channel_id].queue.put(inner_frame)
-
-    def _process_control_message(self, opcode, message):
-        # Ping/Pong are not supported.
-        if opcode == client_for_testing.OPCODE_CLOSE:
-            self._physical_connection_close_message = message
-            if self._is_active:
-                self._stream.send_close(
-                    code=client_for_testing.STATUS_NORMAL_CLOSURE, reason='')
-                self._read_thread.request_stop()
-
-            if self._physical_connection_close_event:
-                self._physical_connection_close_event.set()
-
-    def _notify_reader_done(self):
-        self._logger.debug('Read thread terminated.')
-        self.close_socket()
-
-    def _assert_channel_slot_available(self):
-        try:
-            self._control_blocks_condition.acquire()
-            if len(self._channel_slots) == 0:
-                # Wait once
-                self._control_blocks_condition.wait(timeout=self._timeout)
-        finally:
-            self._control_blocks_condition.release()
-
-        if len(self._channel_slots) == 0:
-            raise Exception('Failed to receive NewChannelSlot')
-
-    def _assert_send_quota_available(self, channel_id):
-        try:
-            self._logical_channels_condition.acquire()
-            if self._logical_channels[channel_id].send_quota == 0:
-                # Wait once
-                self._logical_channels_condition.wait(timeout=self._timeout)
-        finally:
-            self._logical_channels_condition.release()
-
-        if self._logical_channels[channel_id].send_quota == 0:
-            raise Exception('Failed to receive FlowControl for channel id %d' %
-                            channel_id)
-
-    def connect(self):
-        self._socket = client_for_testing.connect_socket_with_retry(
-                self._options.server_host,
-                self._options.server_port,
-                self._options.socket_timeout,
-                self._options.use_tls)
-
-        self._handshake.handshake(self._socket)
-        self._stream = client_for_testing.WebSocketStream(
-            self._socket, self._handshake)
-
-        self._logical_channels[_DEFAULT_CHANNEL_ID] = _LogicalChannelData()
-
-        self._read_thread = _MuxReaderThread(self)
-        self._read_thread.start()
-
-        self._assert_channel_slot_available()
-        self._assert_send_quota_available(_DEFAULT_CHANNEL_ID)
-
-        self._is_active = True
-        self._logger.info('Connection established')
-
-    def add_channel(self, channel_id, options):
-        if not self._is_active:
-            raise Exception('Mux client is not active')
-
-        if channel_id in self._logical_channels:
-            raise Exception('Channel id %d already exists' % channel_id)
-
-        try:
-            send_quota = self._channel_slots.popleft()
-        except IndexError as e:
-            raise Exception('No channel slots: %r' % e)
-
-        # Create AddChannel request
-        request_line = 'GET %s HTTP/1.1\r\n' % options.resource
-        fields = []
-        if options.server_port == client_for_testing.DEFAULT_PORT:
-            fields.append('Host: %s\r\n' % options.server_host.lower())
-        else:
-            fields.append('Host: %s:%d\r\n' % (options.server_host.lower(),
-                                               options.server_port))
-        fields.append('Origin: %s\r\n' % options.origin.lower())
-        fields.append('Connection: Upgrade\r\n')
-
-        if len(options.extensions) > 0:
-            fields.append('Sec-WebSocket-Extensions: %s\r\n' %
-                          ', '.join(options.extensions))
-
-        handshake = request_line + ''.join(fields) + '\r\n'
-        add_channel_request = _create_add_channel_request(
-            channel_id, handshake)
-        payload = _encode_channel_id(_CONTROL_CHANNEL_ID) + add_channel_request
-        self._stream.send_binary(payload)
-
-        # Wait AddChannelResponse
-        self._logger.debug('Waiting AddChannelResponse for the request...')
-        response = None
-        try:
-            self._control_blocks_condition.acquire()
-            while True:
-                for block in self._control_blocks:
-                    if block.opcode != _MUX_OPCODE_ADD_CHANNEL_RESPONSE:
-                        continue
-                    if block.channel_id == channel_id:
-                        response = block
-                        self._control_blocks.remove(response)
-                        break
-                if response:
-                    break
-                self._control_blocks_condition.wait(self._timeout)
-                if not self._is_active:
-                    raise Exception('AddChannelRequest timed out')
-        finally:
-            self._control_blocks_condition.release()
-
-        # Validate AddChannelResponse
-        if response.rejected:
-            raise Exception('The server rejected AddChannelRequest')
-
-        fields = _parse_handshake_response(response.encoded_handshake)
-
-        # Should we reject when Upgrade, Connection, or Sec-WebSocket-Accept
-        # headers exist?
-
-        self._logical_channels_condition.acquire()
-        self._logical_channels[channel_id] = _LogicalChannelData()
-        self._logical_channels[channel_id].send_quota = send_quota
-        self._logical_channels_condition.release()
-
-        self._logger.debug('Logical channel %d established' % channel_id)
-
-    def _check_logical_channel_is_opened(self, channel_id):
-        if not self._is_active:
-            raise Exception('Mux client is not active')
-
-        if not channel_id in self._logical_channels:
-            raise Exception('Logical channel %d is not established.')
-
-    def drop_channel(self, channel_id):
-        # TODO(bashi): Implement
-        pass
-
-    def send_flow_control(self, channel_id, replenished_quota):
-        self._check_logical_channel_is_opened(channel_id)
-        flow_control = _create_flow_control(channel_id, replenished_quota)
-        payload = _encode_channel_id(_CONTROL_CHANNEL_ID) + flow_control
-        # Replenish receive quota
-        try:
-            self._logical_channels_condition.acquire()
-            self._logical_channels[channel_id].receive_quota += (
-                replenished_quota)
-        finally:
-            self._logical_channels_condition.release()
-        self._stream.send_binary(payload)
-
-    def send_message(self, channel_id, message, end=True, binary=False):
-        self._check_logical_channel_is_opened(channel_id)
-
-        if binary:
-            first_byte = (end << 7) | client_for_testing.OPCODE_BINARY
-        else:
-            first_byte = (end << 7) | client_for_testing.OPCODE_TEXT
-            message = message.encode('utf-8')
-
-        try:
-            self._logical_channels_condition.acquire()
-            if self._logical_channels[channel_id].send_quota < len(message):
-                raise Exception('Send quota violation: %d < %d' % (
-                        self._logical_channels[channel_id].send_quota,
-                        len(message)))
-
-            self._logical_channels[channel_id].send_quota -= len(message)
-        finally:
-            self._logical_channels_condition.release()
-        payload = _encode_channel_id(channel_id) + chr(first_byte) + message
-        self._stream.send_binary(payload)
-
-    def assert_receive(self, channel_id, payload, binary=False):
-        self._check_logical_channel_is_opened(channel_id)
-
-        try:
-            inner_frame = self._logical_channels[channel_id].queue.get(
-                timeout=self._timeout)
-        except Queue.Empty as e:
-            raise Exception('Cannot receive message from channel id %d' %
-                            channel_id)
-
-        if binary:
-            opcode = client_for_testing.OPCODE_BINARY
-        else:
-            opcode = client_for_testing.OPCODE_TEXT
-
-        if inner_frame.opcode != opcode:
-            raise Exception('Unexpected opcode received (%r != %r)' %
-                            (expected_opcode, inner_frame.opcode))
-
-        if inner_frame.payload != payload:
-            raise Exception('Unexpected payload received')
-
-    def send_close(self, channel_id, code=None, reason=''):
-        self._check_logical_channel_is_opened(channel_id)
-
-        if code is not None:
-            body = struct.pack('!H', code) + reason.encode('utf-8')
-        else:
-            body = ''
-
-        first_byte = (1 << 7) | client_for_testing.OPCODE_CLOSE
-        payload = _encode_channel_id(channel_id) + chr(first_byte) + body
-        self._stream.send_binary(payload)
-
-    def assert_receive_close(self, channel_id):
-        self._check_logical_channel_is_opened(channel_id)
-
-        try:
-            inner_frame = self._logical_channels[channel_id].queue.get(
-                timeout=self._timeout)
-        except Queue.Empty as e:
-            raise Exception('Cannot receive message from channel id %d' %
-                            channel_id)
-        if inner_frame.opcode != client_for_testing.OPCODE_CLOSE:
-            raise Exception('Didn\'t receive close frame')
-
-    def send_physical_connection_close(self, code=None, reason=''):
-        self._physical_connection_close_event = threading.Event()
-        self._stream.send_close(code, reason)
-
-    # This method can be used only after calling
-    # send_physical_connection_close().
-    def assert_physical_connection_receive_close(
-        self, code=client_for_testing.STATUS_NORMAL_CLOSURE, reason=''):
-        self._physical_connection_close_event.wait(timeout=self._timeout)
-        if (not self._physical_connection_close_event.isSet() or
-            not self._physical_connection_close_message):
-            raise Exception('Didn\'t receive closing handshake')
-
-    def close_socket(self):
-        self._is_active = False
-        self._socket.close()
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_handshake_hybi00.py b/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_handshake_hybi00.py
deleted file mode 100755
index 73f9f27ca2d..00000000000
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_handshake_hybi00.py
+++ /dev/null
@@ -1,516 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2011, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-"""Tests for handshake.hybi00 module."""
-
-
-import unittest
-
-import set_sys_path  # Update sys.path to locate mod_pywebsocket module.
-
-from mod_pywebsocket.handshake._base import HandshakeException
-from mod_pywebsocket.handshake.hybi00 import Handshaker
-from mod_pywebsocket.handshake.hybi00 import _validate_subprotocol
-from test import mock
-
-
-_TEST_KEY1 = '4 @1  46546xW%0l 1 5'
-_TEST_KEY2 = '12998 5 Y3 1  .P00'
-_TEST_KEY3 = '^n:ds[4U'
-_TEST_CHALLENGE_RESPONSE = '8jKS\'y:G*Co,Wxa-'
-
-
-_GOOD_REQUEST = (
-    80,
-    'GET',
-    '/demo',
-    {
-        'Host': 'example.com',
-        'Connection': 'Upgrade',
-        'Sec-WebSocket-Key2': _TEST_KEY2,
-        'Sec-WebSocket-Protocol': 'sample',
-        'Upgrade': 'WebSocket',
-        'Sec-WebSocket-Key1': _TEST_KEY1,
-        'Origin': 'http://example.com',
-    },
-    _TEST_KEY3)
-
-_GOOD_REQUEST_CAPITALIZED_HEADER_VALUES = (
-    80,
-    'GET',
-    '/demo',
-    {
-        'Host': 'example.com',
-        'Connection': 'UPGRADE',
-        'Sec-WebSocket-Key2': _TEST_KEY2,
-        'Sec-WebSocket-Protocol': 'sample',
-        'Upgrade': 'WEBSOCKET',
-        'Sec-WebSocket-Key1': _TEST_KEY1,
-        'Origin': 'http://example.com',
-    },
-    _TEST_KEY3)
-
-_GOOD_REQUEST_CASE_MIXED_HEADER_NAMES = (
-    80,
-    'GET',
-    '/demo',
-    {
-        'hOsT': 'example.com',
-        'cOnNeCtIoN': 'Upgrade',
-        'sEc-wEbsOcKeT-kEy2': _TEST_KEY2,
-        'sEc-wEbsOcKeT-pRoToCoL': 'sample',
-        'uPgRaDe': 'WebSocket',
-        'sEc-wEbsOcKeT-kEy1': _TEST_KEY1,
-        'oRiGiN': 'http://example.com',
-    },
-    _TEST_KEY3)
-
-_GOOD_RESPONSE_DEFAULT_PORT = (
-    'HTTP/1.1 101 WebSocket Protocol Handshake\r\n'
-    'Upgrade: WebSocket\r\n'
-    'Connection: Upgrade\r\n'
-    'Sec-WebSocket-Location: ws://example.com/demo\r\n'
-    'Sec-WebSocket-Origin: http://example.com\r\n'
-    'Sec-WebSocket-Protocol: sample\r\n'
-    '\r\n' +
-    _TEST_CHALLENGE_RESPONSE)
-
-_GOOD_RESPONSE_SECURE = (
-    'HTTP/1.1 101 WebSocket Protocol Handshake\r\n'
-    'Upgrade: WebSocket\r\n'
-    'Connection: Upgrade\r\n'
-    'Sec-WebSocket-Location: wss://example.com/demo\r\n'
-    'Sec-WebSocket-Origin: http://example.com\r\n'
-    'Sec-WebSocket-Protocol: sample\r\n'
-    '\r\n' +
-    _TEST_CHALLENGE_RESPONSE)
-
-_GOOD_REQUEST_NONDEFAULT_PORT = (
-    8081,
-    'GET',
-    '/demo',
-    {
-        'Host': 'example.com:8081',
-        'Connection': 'Upgrade',
-        'Sec-WebSocket-Key2': _TEST_KEY2,
-        'Sec-WebSocket-Protocol': 'sample',
-        'Upgrade': 'WebSocket',
-        'Sec-WebSocket-Key1': _TEST_KEY1,
-        'Origin': 'http://example.com',
-    },
-    _TEST_KEY3)
-
-_GOOD_RESPONSE_NONDEFAULT_PORT = (
-    'HTTP/1.1 101 WebSocket Protocol Handshake\r\n'
-    'Upgrade: WebSocket\r\n'
-    'Connection: Upgrade\r\n'
-    'Sec-WebSocket-Location: ws://example.com:8081/demo\r\n'
-    'Sec-WebSocket-Origin: http://example.com\r\n'
-    'Sec-WebSocket-Protocol: sample\r\n'
-    '\r\n' +
-    _TEST_CHALLENGE_RESPONSE)
-
-_GOOD_RESPONSE_SECURE_NONDEF = (
-    'HTTP/1.1 101 WebSocket Protocol Handshake\r\n'
-    'Upgrade: WebSocket\r\n'
-    'Connection: Upgrade\r\n'
-    'Sec-WebSocket-Location: wss://example.com:8081/demo\r\n'
-    'Sec-WebSocket-Origin: http://example.com\r\n'
-    'Sec-WebSocket-Protocol: sample\r\n'
-    '\r\n' +
-    _TEST_CHALLENGE_RESPONSE)
-
-_GOOD_REQUEST_NO_PROTOCOL = (
-    80,
-    'GET',
-    '/demo',
-    {
-        'Host': 'example.com',
-        'Connection': 'Upgrade',
-        'Sec-WebSocket-Key2': _TEST_KEY2,
-        'Upgrade': 'WebSocket',
-        'Sec-WebSocket-Key1': _TEST_KEY1,
-        'Origin': 'http://example.com',
-    },
-    _TEST_KEY3)
-
-_GOOD_RESPONSE_NO_PROTOCOL = (
-    'HTTP/1.1 101 WebSocket Protocol Handshake\r\n'
-    'Upgrade: WebSocket\r\n'
-    'Connection: Upgrade\r\n'
-    'Sec-WebSocket-Location: ws://example.com/demo\r\n'
-    'Sec-WebSocket-Origin: http://example.com\r\n'
-    '\r\n' +
-    _TEST_CHALLENGE_RESPONSE)
-
-_GOOD_REQUEST_WITH_OPTIONAL_HEADERS = (
-    80,
-    'GET',
-    '/demo',
-    {
-        'Host': 'example.com',
-        'Connection': 'Upgrade',
-        'Sec-WebSocket-Key2': _TEST_KEY2,
-        'EmptyValue': '',
-        'Sec-WebSocket-Protocol': 'sample',
-        'AKey': 'AValue',
-        'Upgrade': 'WebSocket',
-        'Sec-WebSocket-Key1': _TEST_KEY1,
-        'Origin': 'http://example.com',
-    },
-    _TEST_KEY3)
-
-# TODO(tyoshino): Include \r \n in key3, challenge response.
-
-_GOOD_REQUEST_WITH_NONPRINTABLE_KEY = (
-    80,
-    'GET',
-    '/demo',
-    {
-        'Host': 'example.com',
-        'Connection': 'Upgrade',
-        'Sec-WebSocket-Key2': 'y  R2 48 Q1O4  e|BV3 i5 1  u- 65',
-        'Sec-WebSocket-Protocol': 'sample',
-        'Upgrade': 'WebSocket',
-        'Sec-WebSocket-Key1': '36 7   74 i  92 2\'m 9 0G',
-        'Origin': 'http://example.com',
-    },
-    ''.join(map(chr, [0x01, 0xd1, 0xdd, 0x3b, 0xd1, 0x56, 0x63, 0xff])))
-
-_GOOD_RESPONSE_WITH_NONPRINTABLE_KEY = (
-    'HTTP/1.1 101 WebSocket Protocol Handshake\r\n'
-    'Upgrade: WebSocket\r\n'
-    'Connection: Upgrade\r\n'
-    'Sec-WebSocket-Location: ws://example.com/demo\r\n'
-    'Sec-WebSocket-Origin: http://example.com\r\n'
-    'Sec-WebSocket-Protocol: sample\r\n'
-    '\r\n' +
-    ''.join(map(chr, [0x0b, 0x99, 0xfa, 0x55, 0xbd, 0x01, 0x23, 0x7b,
-                      0x45, 0xa2, 0xf1, 0xd0, 0x87, 0x8a, 0xee, 0xeb])))
-
-_GOOD_REQUEST_WITH_QUERY_PART = (
-    80,
-    'GET',
-    '/demo?e=mc2',
-    {
-        'Host': 'example.com',
-        'Connection': 'Upgrade',
-        'Sec-WebSocket-Key2': _TEST_KEY2,
-        'Sec-WebSocket-Protocol': 'sample',
-        'Upgrade': 'WebSocket',
-        'Sec-WebSocket-Key1': _TEST_KEY1,
-        'Origin': 'http://example.com',
-    },
-    _TEST_KEY3)
-
-_GOOD_RESPONSE_WITH_QUERY_PART = (
-    'HTTP/1.1 101 WebSocket Protocol Handshake\r\n'
-    'Upgrade: WebSocket\r\n'
-    'Connection: Upgrade\r\n'
-    'Sec-WebSocket-Location: ws://example.com/demo?e=mc2\r\n'
-    'Sec-WebSocket-Origin: http://example.com\r\n'
-    'Sec-WebSocket-Protocol: sample\r\n'
-    '\r\n' +
-    _TEST_CHALLENGE_RESPONSE)
-
-_BAD_REQUESTS = (
-    (  # HTTP request
-        80,
-        'GET',
-        '/demo',
-        {
-            'Host': 'www.google.com',
-            'User-Agent': 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5;'
-                          ' en-US; rv:1.9.1.3) Gecko/20090824 Firefox/3.5.3'
-                          ' GTB6 GTBA',
-            'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,'
-                      '*/*;q=0.8',
-            'Accept-Language': 'en-us,en;q=0.5',
-            'Accept-Encoding': 'gzip,deflate',
-            'Accept-Charset': 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
-            'Keep-Alive': '300',
-            'Connection': 'keep-alive',
-        }),
-    (  # Wrong method
-        80,
-        'POST',
-        '/demo',
-        {
-            'Host': 'example.com',
-            'Connection': 'Upgrade',
-            'Sec-WebSocket-Key2': _TEST_KEY2,
-            'Sec-WebSocket-Protocol': 'sample',
-            'Upgrade': 'WebSocket',
-            'Sec-WebSocket-Key1': _TEST_KEY1,
-            'Origin': 'http://example.com',
-        },
-        _TEST_KEY3),
-    (  # Missing Upgrade
-        80,
-        'GET',
-        '/demo',
-        {
-            'Host': 'example.com',
-            'Connection': 'Upgrade',
-            'Sec-WebSocket-Key2': _TEST_KEY2,
-            'Sec-WebSocket-Protocol': 'sample',
-            'Sec-WebSocket-Key1': _TEST_KEY1,
-            'Origin': 'http://example.com',
-        },
-        _TEST_KEY3),
-    (  # Wrong Upgrade
-        80,
-        'GET',
-        '/demo',
-        {
-            'Host': 'example.com',
-            'Connection': 'Upgrade',
-            'Sec-WebSocket-Key2': _TEST_KEY2,
-            'Sec-WebSocket-Protocol': 'sample',
-            'Upgrade': 'NonWebSocket',
-            'Sec-WebSocket-Key1': _TEST_KEY1,
-            'Origin': 'http://example.com',
-        },
-        _TEST_KEY3),
-    (  # Empty WebSocket-Protocol
-        80,
-        'GET',
-        '/demo',
-        {
-            'Host': 'example.com',
-            'Connection': 'Upgrade',
-            'Sec-WebSocket-Key2': _TEST_KEY2,
-            'Sec-WebSocket-Protocol': '',
-            'Upgrade': 'WebSocket',
-            'Sec-WebSocket-Key1': _TEST_KEY1,
-            'Origin': 'http://example.com',
-        },
-        _TEST_KEY3),
-    (  # Wrong port number format
-        80,
-        'GET',
-        '/demo',
-        {
-            'Host': 'example.com:0x50',
-            'Connection': 'Upgrade',
-            'Sec-WebSocket-Key2': _TEST_KEY2,
-            'Sec-WebSocket-Protocol': 'sample',
-            'Upgrade': 'WebSocket',
-            'Sec-WebSocket-Key1': _TEST_KEY1,
-            'Origin': 'http://example.com',
-        },
-        _TEST_KEY3),
-    (  # Header/connection port mismatch
-        8080,
-        'GET',
-        '/demo',
-        {
-            'Host': 'example.com',
-            'Connection': 'Upgrade',
-            'Sec-WebSocket-Key2': _TEST_KEY2,
-            'Sec-WebSocket-Protocol': 'sample',
-            'Upgrade': 'WebSocket',
-            'Sec-WebSocket-Key1': _TEST_KEY1,
-            'Origin': 'http://example.com',
-        },
-        _TEST_KEY3),
-    (  # Illegal WebSocket-Protocol
-        80,
-        'GET',
-        '/demo',
-        {
-            'Host': 'example.com',
-            'Connection': 'Upgrade',
-            'Sec-WebSocket-Key2': _TEST_KEY2,
-            'Sec-WebSocket-Protocol': 'illegal\x09protocol',
-            'Upgrade': 'WebSocket',
-            'Sec-WebSocket-Key1': _TEST_KEY1,
-            'Origin': 'http://example.com',
-        },
-        _TEST_KEY3),
-)
-
-
-def _create_request(request_def):
-    data = ''
-    if len(request_def) > 4:
-        data = request_def[4]
-    conn = mock.MockConn(data)
-    conn.local_addr = ('0.0.0.0', request_def[0])
-    return mock.MockRequest(
-        method=request_def[1],
-        uri=request_def[2],
-        headers_in=request_def[3],
-        connection=conn)
-
-
-def _create_get_memorized_lines(lines):
-    """Creates a function that returns the given string."""
-
-    def get_memorized_lines():
-        return lines
-    return get_memorized_lines
-
-
-def _create_requests_with_lines(request_lines_set):
-    requests = []
-    for lines in request_lines_set:
-        request = _create_request(_GOOD_REQUEST)
-        request.connection.get_memorized_lines = _create_get_memorized_lines(
-                lines)
-        requests.append(request)
-    return requests
-
-
-class HyBi00HandshakerTest(unittest.TestCase):
-
-    def test_good_request_default_port(self):
-        request = _create_request(_GOOD_REQUEST)
-        handshaker = Handshaker(request, mock.MockDispatcher())
-        handshaker.do_handshake()
-        self.assertEqual(_GOOD_RESPONSE_DEFAULT_PORT,
-                         request.connection.written_data())
-        self.assertEqual('/demo', request.ws_resource)
-        self.assertEqual('http://example.com', request.ws_origin)
-        self.assertEqual('ws://example.com/demo', request.ws_location)
-        self.assertEqual('sample', request.ws_protocol)
-
-    def test_good_request_capitalized_header_values(self):
-        request = _create_request(_GOOD_REQUEST_CAPITALIZED_HEADER_VALUES)
-        handshaker = Handshaker(request, mock.MockDispatcher())
-        handshaker.do_handshake()
-        self.assertEqual(_GOOD_RESPONSE_DEFAULT_PORT,
-                         request.connection.written_data())
-
-    def test_good_request_case_mixed_header_names(self):
-        request = _create_request(_GOOD_REQUEST_CASE_MIXED_HEADER_NAMES)
-        handshaker = Handshaker(request, mock.MockDispatcher())
-        handshaker.do_handshake()
-        self.assertEqual(_GOOD_RESPONSE_DEFAULT_PORT,
-                         request.connection.written_data())
-
-    def test_good_request_secure_default_port(self):
-        request = _create_request(_GOOD_REQUEST)
-        request.connection.local_addr = ('0.0.0.0', 443)
-        request.is_https_ = True
-        handshaker = Handshaker(request, mock.MockDispatcher())
-        handshaker.do_handshake()
-        self.assertEqual(_GOOD_RESPONSE_SECURE,
-                         request.connection.written_data())
-        self.assertEqual('sample', request.ws_protocol)
-
-    def test_good_request_nondefault_port(self):
-        request = _create_request(_GOOD_REQUEST_NONDEFAULT_PORT)
-        handshaker = Handshaker(request,
-                                          mock.MockDispatcher())
-        handshaker.do_handshake()
-        self.assertEqual(_GOOD_RESPONSE_NONDEFAULT_PORT,
-                         request.connection.written_data())
-        self.assertEqual('sample', request.ws_protocol)
-
-    def test_good_request_secure_non_default_port(self):
-        request = _create_request(_GOOD_REQUEST_NONDEFAULT_PORT)
-        request.is_https_ = True
-        handshaker = Handshaker(request, mock.MockDispatcher())
-        handshaker.do_handshake()
-        self.assertEqual(_GOOD_RESPONSE_SECURE_NONDEF,
-                         request.connection.written_data())
-        self.assertEqual('sample', request.ws_protocol)
-
-    def test_good_request_default_no_protocol(self):
-        request = _create_request(_GOOD_REQUEST_NO_PROTOCOL)
-        handshaker = Handshaker(request, mock.MockDispatcher())
-        handshaker.do_handshake()
-        self.assertEqual(_GOOD_RESPONSE_NO_PROTOCOL,
-                         request.connection.written_data())
-        self.assertEqual(None, request.ws_protocol)
-
-    def test_good_request_optional_headers(self):
-        request = _create_request(_GOOD_REQUEST_WITH_OPTIONAL_HEADERS)
-        handshaker = Handshaker(request, mock.MockDispatcher())
-        handshaker.do_handshake()
-        self.assertEqual('AValue',
-                         request.headers_in['AKey'])
-        self.assertEqual('',
-                         request.headers_in['EmptyValue'])
-
-    def test_good_request_with_nonprintable_key(self):
-        request = _create_request(_GOOD_REQUEST_WITH_NONPRINTABLE_KEY)
-        handshaker = Handshaker(request, mock.MockDispatcher())
-        handshaker.do_handshake()
-        self.assertEqual(_GOOD_RESPONSE_WITH_NONPRINTABLE_KEY,
-                         request.connection.written_data())
-        self.assertEqual('sample', request.ws_protocol)
-
-    def test_good_request_with_query_part(self):
-        request = _create_request(_GOOD_REQUEST_WITH_QUERY_PART)
-        handshaker = Handshaker(request, mock.MockDispatcher())
-        handshaker.do_handshake()
-        self.assertEqual(_GOOD_RESPONSE_WITH_QUERY_PART,
-                         request.connection.written_data())
-        self.assertEqual('ws://example.com/demo?e=mc2', request.ws_location)
-
-    def test_bad_requests(self):
-        for request in map(_create_request, _BAD_REQUESTS):
-            handshaker = Handshaker(request, mock.MockDispatcher())
-            self.assertRaises(HandshakeException, handshaker.do_handshake)
-
-
-class HyBi00ValidateSubprotocolTest(unittest.TestCase):
-    def test_validate_subprotocol(self):
-        # should succeed.
-        _validate_subprotocol('sample')
-        _validate_subprotocol('Sample')
-        _validate_subprotocol('sample\x7eprotocol')
-        _validate_subprotocol('sample\x20protocol')
-
-        # should fail.
-        self.assertRaises(HandshakeException,
-                          _validate_subprotocol,
-                          '')
-        self.assertRaises(HandshakeException,
-                          _validate_subprotocol,
-                          'sample\x19protocol')
-        self.assertRaises(HandshakeException,
-                          _validate_subprotocol,
-                          'sample\x7fprotocol')
-        self.assertRaises(HandshakeException,
-                          _validate_subprotocol,
-                          # "Japan" in Japanese
-                          u'\u65e5\u672c')
-
-
-if __name__ == '__main__':
-    unittest.main()
-
-
-# vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_msgutil.py b/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_msgutil.py
deleted file mode 100755
index 234735c6304..00000000000
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_msgutil.py
+++ /dev/null
@@ -1,1347 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2012, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-"""Tests for msgutil module."""
-from __future__ import print_function
-
-
-import array
-import Queue
-import random
-import struct
-import unittest
-import zlib
-
-import set_sys_path  # Update sys.path to locate mod_pywebsocket module.
-
-from mod_pywebsocket import common
-from mod_pywebsocket.extensions import DeflateFrameExtensionProcessor
-from mod_pywebsocket.extensions import PerMessageDeflateExtensionProcessor
-from mod_pywebsocket import msgutil
-from mod_pywebsocket.stream import InvalidUTF8Exception
-from mod_pywebsocket.stream import Stream
-from mod_pywebsocket.stream import StreamHixie75
-from mod_pywebsocket.stream import StreamOptions
-from mod_pywebsocket import util
-from test import mock
-
-
-# We use one fixed nonce for testing instead of cryptographically secure PRNG.
-_MASKING_NONCE = 'ABCD'
-
-
-def _mask_hybi(frame):
-    frame_key = map(ord, _MASKING_NONCE)
-    frame_key_len = len(frame_key)
-    result = array.array('B')
-    result.fromstring(frame)
-    count = 0
-    for i in xrange(len(result)):
-        result[i] ^= frame_key[count]
-        count = (count + 1) % frame_key_len
-    return _MASKING_NONCE + result.tostring()
-
-
-def _install_extension_processor(processor, request, stream_options):
-    response = processor.get_extension_response()
-    if response is not None:
-        processor.setup_stream_options(stream_options)
-        request.ws_extension_processors.append(processor)
-
-
-def _create_request_from_rawdata(
-        read_data,
-        deflate_frame_request=None,
-        permessage_deflate_request=None):
-    req = mock.MockRequest(connection=mock.MockConn(''.join(read_data)))
-    req.ws_version = common.VERSION_HYBI_LATEST
-    req.ws_extension_processors = []
-
-    processor = None
-    if deflate_frame_request is not None:
-        processor = DeflateFrameExtensionProcessor(deflate_frame_request)
-    elif permessage_deflate_request is not None:
-        processor = PerMessageDeflateExtensionProcessor(
-                permessage_deflate_request)
-
-    stream_options = StreamOptions()
-    if processor is not None:
-        _install_extension_processor(processor, req, stream_options)
-    req.ws_stream = Stream(req, stream_options)
-
-    return req
-
-
-def _create_request(*frames):
-    """Creates MockRequest using data given as frames.
-
-    frames will be returned on calling request.connection.read() where request
-    is MockRequest returned by this function.
-    """
-
-    read_data = []
-    for (header, body) in frames:
-        read_data.append(header + _mask_hybi(body))
-
-    return _create_request_from_rawdata(read_data)
-
-
-def _create_blocking_request():
-    """Creates MockRequest.
-
-    Data written to a MockRequest can be read out by calling
-    request.connection.written_data().
-    """
-
-    req = mock.MockRequest(connection=mock.MockBlockingConn())
-    req.ws_version = common.VERSION_HYBI_LATEST
-    stream_options = StreamOptions()
-    req.ws_stream = Stream(req, stream_options)
-    return req
-
-
-def _create_request_hixie75(read_data=''):
-    req = mock.MockRequest(connection=mock.MockConn(read_data))
-    req.ws_stream = StreamHixie75(req)
-    return req
-
-
-def _create_blocking_request_hixie75():
-    req = mock.MockRequest(connection=mock.MockBlockingConn())
-    req.ws_stream = StreamHixie75(req)
-    return req
-
-
-class BasicMessageTest(unittest.TestCase):
-    """Basic tests for Stream."""
-
-    def test_send_message(self):
-        request = _create_request()
-        msgutil.send_message(request, 'Hello')
-        self.assertEqual('\x81\x05Hello', request.connection.written_data())
-
-        payload = 'a' * 125
-        request = _create_request()
-        msgutil.send_message(request, payload)
-        self.assertEqual('\x81\x7d' + payload,
-                         request.connection.written_data())
-
-    def test_send_medium_message(self):
-        payload = 'a' * 126
-        request = _create_request()
-        msgutil.send_message(request, payload)
-        self.assertEqual('\x81\x7e\x00\x7e' + payload,
-                         request.connection.written_data())
-
-        payload = 'a' * ((1 << 16) - 1)
-        request = _create_request()
-        msgutil.send_message(request, payload)
-        self.assertEqual('\x81\x7e\xff\xff' + payload,
-                         request.connection.written_data())
-
-    def test_send_large_message(self):
-        payload = 'a' * (1 << 16)
-        request = _create_request()
-        msgutil.send_message(request, payload)
-        self.assertEqual('\x81\x7f\x00\x00\x00\x00\x00\x01\x00\x00' + payload,
-                         request.connection.written_data())
-
-    def test_send_message_unicode(self):
-        request = _create_request()
-        msgutil.send_message(request, u'\u65e5')
-        # U+65e5 is encoded as e6,97,a5 in UTF-8
-        self.assertEqual('\x81\x03\xe6\x97\xa5',
-                         request.connection.written_data())
-
-    def test_send_message_fragments(self):
-        request = _create_request()
-        msgutil.send_message(request, 'Hello', False)
-        msgutil.send_message(request, ' ', False)
-        msgutil.send_message(request, 'World', False)
-        msgutil.send_message(request, '!', True)
-        self.assertEqual('\x01\x05Hello\x00\x01 \x00\x05World\x80\x01!',
-                         request.connection.written_data())
-
-    def test_send_fragments_immediate_zero_termination(self):
-        request = _create_request()
-        msgutil.send_message(request, 'Hello World!', False)
-        msgutil.send_message(request, '', True)
-        self.assertEqual('\x01\x0cHello World!\x80\x00',
-                         request.connection.written_data())
-
-    def test_receive_message(self):
-        request = _create_request(
-            ('\x81\x85', 'Hello'), ('\x81\x86', 'World!'))
-        self.assertEqual('Hello', msgutil.receive_message(request))
-        self.assertEqual('World!', msgutil.receive_message(request))
-
-        payload = 'a' * 125
-        request = _create_request(('\x81\xfd', payload))
-        self.assertEqual(payload, msgutil.receive_message(request))
-
-    def test_receive_medium_message(self):
-        payload = 'a' * 126
-        request = _create_request(('\x81\xfe\x00\x7e', payload))
-        self.assertEqual(payload, msgutil.receive_message(request))
-
-        payload = 'a' * ((1 << 16) - 1)
-        request = _create_request(('\x81\xfe\xff\xff', payload))
-        self.assertEqual(payload, msgutil.receive_message(request))
-
-    def test_receive_large_message(self):
-        payload = 'a' * (1 << 16)
-        request = _create_request(
-            ('\x81\xff\x00\x00\x00\x00\x00\x01\x00\x00', payload))
-        self.assertEqual(payload, msgutil.receive_message(request))
-
-    def test_receive_length_not_encoded_using_minimal_number_of_bytes(self):
-        # Log warning on receiving bad payload length field that doesn't use
-        # minimal number of bytes but continue processing.
-
-        payload = 'a'
-        # 1 byte can be represented without extended payload length field.
-        request = _create_request(
-            ('\x81\xff\x00\x00\x00\x00\x00\x00\x00\x01', payload))
-        self.assertEqual(payload, msgutil.receive_message(request))
-
-    def test_receive_message_unicode(self):
-        request = _create_request(('\x81\x83', '\xe6\x9c\xac'))
-        # U+672c is encoded as e6,9c,ac in UTF-8
-        self.assertEqual(u'\u672c', msgutil.receive_message(request))
-
-    def test_receive_message_erroneous_unicode(self):
-        # \x80 and \x81 are invalid as UTF-8.
-        request = _create_request(('\x81\x82', '\x80\x81'))
-        # Invalid characters should raise InvalidUTF8Exception
-        self.assertRaises(InvalidUTF8Exception,
-                          msgutil.receive_message,
-                          request)
-
-    def test_receive_fragments(self):
-        request = _create_request(
-            ('\x01\x85', 'Hello'),
-            ('\x00\x81', ' '),
-            ('\x00\x85', 'World'),
-            ('\x80\x81', '!'))
-        self.assertEqual('Hello World!', msgutil.receive_message(request))
-
-    def test_receive_fragments_unicode(self):
-        # UTF-8 encodes U+6f22 into e6bca2 and U+5b57 into e5ad97.
-        request = _create_request(
-            ('\x01\x82', '\xe6\xbc'),
-            ('\x00\x82', '\xa2\xe5'),
-            ('\x80\x82', '\xad\x97'))
-        self.assertEqual(u'\u6f22\u5b57', msgutil.receive_message(request))
-
-    def test_receive_fragments_immediate_zero_termination(self):
-        request = _create_request(
-            ('\x01\x8c', 'Hello World!'), ('\x80\x80', ''))
-        self.assertEqual('Hello World!', msgutil.receive_message(request))
-
-    def test_receive_fragments_duplicate_start(self):
-        request = _create_request(
-            ('\x01\x85', 'Hello'), ('\x01\x85', 'World'))
-        self.assertRaises(msgutil.InvalidFrameException,
-                          msgutil.receive_message,
-                          request)
-
-    def test_receive_fragments_intermediate_but_not_started(self):
-        request = _create_request(('\x00\x85', 'Hello'))
-        self.assertRaises(msgutil.InvalidFrameException,
-                          msgutil.receive_message,
-                          request)
-
-    def test_receive_fragments_end_but_not_started(self):
-        request = _create_request(('\x80\x85', 'Hello'))
-        self.assertRaises(msgutil.InvalidFrameException,
-                          msgutil.receive_message,
-                          request)
-
-    def test_receive_message_discard(self):
-        request = _create_request(
-            ('\x8f\x86', 'IGNORE'), ('\x81\x85', 'Hello'),
-            ('\x8f\x89', 'DISREGARD'), ('\x81\x86', 'World!'))
-        self.assertRaises(msgutil.UnsupportedFrameException,
-                          msgutil.receive_message, request)
-        self.assertEqual('Hello', msgutil.receive_message(request))
-        self.assertRaises(msgutil.UnsupportedFrameException,
-                          msgutil.receive_message, request)
-        self.assertEqual('World!', msgutil.receive_message(request))
-
-    def test_receive_close(self):
-        request = _create_request(
-            ('\x88\x8a', struct.pack('!H', 1000) + 'Good bye'))
-        self.assertEqual(None, msgutil.receive_message(request))
-        self.assertEqual(1000, request.ws_close_code)
-        self.assertEqual('Good bye', request.ws_close_reason)
-
-    def test_send_longest_close(self):
-        reason = 'a' * 123
-        request = _create_request(
-            ('\x88\xfd',
-             struct.pack('!H', common.STATUS_NORMAL_CLOSURE) + reason))
-        request.ws_stream.close_connection(common.STATUS_NORMAL_CLOSURE,
-                                           reason)
-        self.assertEqual(request.ws_close_code, common.STATUS_NORMAL_CLOSURE)
-        self.assertEqual(request.ws_close_reason, reason)
-
-    def test_send_close_too_long(self):
-        request = _create_request()
-        self.assertRaises(msgutil.BadOperationException,
-                          Stream.close_connection,
-                          request.ws_stream,
-                          common.STATUS_NORMAL_CLOSURE,
-                          'a' * 124)
-
-    def test_send_close_inconsistent_code_and_reason(self):
-        request = _create_request()
-        # reason parameter must not be specified when code is None.
-        self.assertRaises(msgutil.BadOperationException,
-                          Stream.close_connection,
-                          request.ws_stream,
-                          None,
-                          'a')
-
-    def test_send_ping(self):
-        request = _create_request()
-        msgutil.send_ping(request, 'Hello World!')
-        self.assertEqual('\x89\x0cHello World!',
-                         request.connection.written_data())
-
-    def test_send_longest_ping(self):
-        request = _create_request()
-        msgutil.send_ping(request, 'a' * 125)
-        self.assertEqual('\x89\x7d' + 'a' * 125,
-                         request.connection.written_data())
-
-    def test_send_ping_too_long(self):
-        request = _create_request()
-        self.assertRaises(msgutil.BadOperationException,
-                          msgutil.send_ping,
-                          request,
-                          'a' * 126)
-
-    def test_receive_ping(self):
-        """Tests receiving a ping control frame."""
-
-        def handler(request, message):
-            request.called = True
-
-        # Stream automatically respond to ping with pong without any action
-        # by application layer.
-        request = _create_request(
-            ('\x89\x85', 'Hello'), ('\x81\x85', 'World'))
-        self.assertEqual('World', msgutil.receive_message(request))
-        self.assertEqual('\x8a\x05Hello',
-                         request.connection.written_data())
-
-        request = _create_request(
-            ('\x89\x85', 'Hello'), ('\x81\x85', 'World'))
-        request.on_ping_handler = handler
-        self.assertEqual('World', msgutil.receive_message(request))
-        self.assertTrue(request.called)
-
-    def test_receive_longest_ping(self):
-        request = _create_request(
-            ('\x89\xfd', 'a' * 125), ('\x81\x85', 'World'))
-        self.assertEqual('World', msgutil.receive_message(request))
-        self.assertEqual('\x8a\x7d' + 'a' * 125,
-                         request.connection.written_data())
-
-    def test_receive_ping_too_long(self):
-        request = _create_request(('\x89\xfe\x00\x7e', 'a' * 126))
-        self.assertRaises(msgutil.InvalidFrameException,
-                          msgutil.receive_message,
-                          request)
-
-    def test_receive_pong(self):
-        """Tests receiving a pong control frame."""
-
-        def handler(request, message):
-            request.called = True
-
-        request = _create_request(
-            ('\x8a\x85', 'Hello'), ('\x81\x85', 'World'))
-        request.on_pong_handler = handler
-        msgutil.send_ping(request, 'Hello')
-        self.assertEqual('\x89\x05Hello',
-                         request.connection.written_data())
-        # Valid pong is received, but receive_message won't return for it.
-        self.assertEqual('World', msgutil.receive_message(request))
-        # Check that nothing was written after receive_message call.
-        self.assertEqual('\x89\x05Hello',
-                         request.connection.written_data())
-
-        self.assertTrue(request.called)
-
-    def test_receive_unsolicited_pong(self):
-        # Unsolicited pong is allowed from HyBi 07.
-        request = _create_request(
-            ('\x8a\x85', 'Hello'), ('\x81\x85', 'World'))
-        msgutil.receive_message(request)
-
-        request = _create_request(
-            ('\x8a\x85', 'Hello'), ('\x81\x85', 'World'))
-        msgutil.send_ping(request, 'Jumbo')
-        # Body mismatch.
-        msgutil.receive_message(request)
-
-    def test_ping_cannot_be_fragmented(self):
-        request = _create_request(('\x09\x85', 'Hello'))
-        self.assertRaises(msgutil.InvalidFrameException,
-                          msgutil.receive_message,
-                          request)
-
-    def test_ping_with_too_long_payload(self):
-        request = _create_request(('\x89\xfe\x01\x00', 'a' * 256))
-        self.assertRaises(msgutil.InvalidFrameException,
-                          msgutil.receive_message,
-                          request)
-
-
-class DeflateFrameTest(unittest.TestCase):
-    """Tests for checking deflate-frame extension."""
-
-    def test_send_message(self):
-        compress = zlib.compressobj(
-            zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED, -zlib.MAX_WBITS)
-
-        extension = common.ExtensionParameter(common.DEFLATE_FRAME_EXTENSION)
-        request = _create_request_from_rawdata(
-            '', deflate_frame_request=extension)
-        msgutil.send_message(request, 'Hello')
-        msgutil.send_message(request, 'World')
-
-        expected = ''
-
-        compressed_hello = compress.compress('Hello')
-        compressed_hello += compress.flush(zlib.Z_SYNC_FLUSH)
-        compressed_hello = compressed_hello[:-4]
-        expected += '\xc1%c' % len(compressed_hello)
-        expected += compressed_hello
-
-        compressed_world = compress.compress('World')
-        compressed_world += compress.flush(zlib.Z_SYNC_FLUSH)
-        compressed_world = compressed_world[:-4]
-        expected += '\xc1%c' % len(compressed_world)
-        expected += compressed_world
-
-        self.assertEqual(expected, request.connection.written_data())
-
-    def test_send_message_bfinal(self):
-        extension = common.ExtensionParameter(common.DEFLATE_FRAME_EXTENSION)
-        request = _create_request_from_rawdata(
-            '', deflate_frame_request=extension)
-        self.assertEquals(1, len(request.ws_extension_processors))
-        deflate_frame_processor = request.ws_extension_processors[0]
-        deflate_frame_processor.set_bfinal(True)
-        msgutil.send_message(request, 'Hello')
-        msgutil.send_message(request, 'World')
-
-        expected = ''
-
-        compress = zlib.compressobj(
-            zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED, -zlib.MAX_WBITS)
-        compressed_hello = compress.compress('Hello')
-        compressed_hello += compress.flush(zlib.Z_FINISH)
-        compressed_hello = compressed_hello + chr(0)
-        expected += '\xc1%c' % len(compressed_hello)
-        expected += compressed_hello
-
-        compress = zlib.compressobj(
-            zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED, -zlib.MAX_WBITS)
-        compressed_world = compress.compress('World')
-        compressed_world += compress.flush(zlib.Z_FINISH)
-        compressed_world = compressed_world + chr(0)
-        expected += '\xc1%c' % len(compressed_world)
-        expected += compressed_world
-
-        self.assertEqual(expected, request.connection.written_data())
-
-    def test_send_message_comp_bit(self):
-        compress = zlib.compressobj(
-            zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED, -zlib.MAX_WBITS)
-
-        extension = common.ExtensionParameter(common.DEFLATE_FRAME_EXTENSION)
-        request = _create_request_from_rawdata(
-            '', deflate_frame_request=extension)
-        self.assertEquals(1, len(request.ws_extension_processors))
-        deflate_frame_processor = request.ws_extension_processors[0]
-        msgutil.send_message(request, 'Hello')
-        deflate_frame_processor.disable_outgoing_compression()
-        msgutil.send_message(request, 'Hello')
-        deflate_frame_processor.enable_outgoing_compression()
-        msgutil.send_message(request, 'Hello')
-
-        expected = ''
-
-        compressed_hello = compress.compress('Hello')
-        compressed_hello += compress.flush(zlib.Z_SYNC_FLUSH)
-        compressed_hello = compressed_hello[:-4]
-        expected += '\xc1%c' % len(compressed_hello)
-        expected += compressed_hello
-
-        expected += '\x81\x05Hello'
-
-        compressed_2nd_hello = compress.compress('Hello')
-        compressed_2nd_hello += compress.flush(zlib.Z_SYNC_FLUSH)
-        compressed_2nd_hello = compressed_2nd_hello[:-4]
-        expected += '\xc1%c' % len(compressed_2nd_hello)
-        expected += compressed_2nd_hello
-
-        self.assertEqual(expected, request.connection.written_data())
-
-    def test_send_message_no_context_takeover_parameter(self):
-        compress = zlib.compressobj(
-            zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED, -zlib.MAX_WBITS)
-
-        extension = common.ExtensionParameter(common.DEFLATE_FRAME_EXTENSION)
-        extension.add_parameter('no_context_takeover', None)
-        request = _create_request_from_rawdata(
-            '', deflate_frame_request=extension)
-        for i in xrange(3):
-            msgutil.send_message(request, 'Hello')
-
-        compressed_message = compress.compress('Hello')
-        compressed_message += compress.flush(zlib.Z_SYNC_FLUSH)
-        compressed_message = compressed_message[:-4]
-        expected = '\xc1%c' % len(compressed_message)
-        expected += compressed_message
-
-        self.assertEqual(
-            expected + expected + expected, request.connection.written_data())
-
-    def test_bad_request_parameters(self):
-        """Tests that if there's anything wrong with deflate-frame extension
-        request, deflate-frame is rejected.
-        """
-
-        extension = common.ExtensionParameter(common.DEFLATE_FRAME_EXTENSION)
-        # max_window_bits less than 8 is illegal.
-        extension.add_parameter('max_window_bits', '7')
-        processor = DeflateFrameExtensionProcessor(extension)
-        self.assertEqual(None, processor.get_extension_response())
-
-        extension = common.ExtensionParameter(common.DEFLATE_FRAME_EXTENSION)
-        # max_window_bits greater than 15 is illegal.
-        extension.add_parameter('max_window_bits', '16')
-        processor = DeflateFrameExtensionProcessor(extension)
-        self.assertEqual(None, processor.get_extension_response())
-
-        extension = common.ExtensionParameter(common.DEFLATE_FRAME_EXTENSION)
-        # Non integer max_window_bits is illegal.
-        extension.add_parameter('max_window_bits', 'foobar')
-        processor = DeflateFrameExtensionProcessor(extension)
-        self.assertEqual(None, processor.get_extension_response())
-
-        extension = common.ExtensionParameter(common.DEFLATE_FRAME_EXTENSION)
-        # no_context_takeover must not have any value.
-        extension.add_parameter('no_context_takeover', 'foobar')
-        processor = DeflateFrameExtensionProcessor(extension)
-        self.assertEqual(None, processor.get_extension_response())
-
-    def test_response_parameters(self):
-        extension = common.ExtensionParameter(common.DEFLATE_FRAME_EXTENSION)
-        processor = DeflateFrameExtensionProcessor(extension)
-        processor.set_response_window_bits(8)
-        response = processor.get_extension_response()
-        self.assertTrue(response.has_parameter('max_window_bits'))
-        self.assertEqual('8', response.get_parameter_value('max_window_bits'))
-
-        extension = common.ExtensionParameter(common.DEFLATE_FRAME_EXTENSION)
-        processor = DeflateFrameExtensionProcessor(extension)
-        processor.set_response_no_context_takeover(True)
-        response = processor.get_extension_response()
-        self.assertTrue(response.has_parameter('no_context_takeover'))
-        self.assertTrue(
-            response.get_parameter_value('no_context_takeover') is None)
-
-    def test_receive_message(self):
-        compress = zlib.compressobj(
-            zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED, -zlib.MAX_WBITS)
-
-        data = ''
-
-        compressed_hello = compress.compress('Hello')
-        compressed_hello += compress.flush(zlib.Z_SYNC_FLUSH)
-        compressed_hello = compressed_hello[:-4]
-        data += '\xc1%c' % (len(compressed_hello) | 0x80)
-        data += _mask_hybi(compressed_hello)
-
-        compressed_websocket = compress.compress('WebSocket')
-        compressed_websocket += compress.flush(zlib.Z_FINISH)
-        compressed_websocket += '\x00'
-        data += '\xc1%c' % (len(compressed_websocket) | 0x80)
-        data += _mask_hybi(compressed_websocket)
-
-        compress = zlib.compressobj(
-            zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED, -zlib.MAX_WBITS)
-
-        compressed_world = compress.compress('World')
-        compressed_world += compress.flush(zlib.Z_SYNC_FLUSH)
-        compressed_world = compressed_world[:-4]
-        data += '\xc1%c' % (len(compressed_world) | 0x80)
-        data += _mask_hybi(compressed_world)
-
-        # Close frame
-        data += '\x88\x8a' + _mask_hybi(struct.pack('!H', 1000) + 'Good bye')
-
-        extension = common.ExtensionParameter(common.DEFLATE_FRAME_EXTENSION)
-        request = _create_request_from_rawdata(
-            data, deflate_frame_request=extension)
-        self.assertEqual('Hello', msgutil.receive_message(request))
-        self.assertEqual('WebSocket', msgutil.receive_message(request))
-        self.assertEqual('World', msgutil.receive_message(request))
-
-        self.assertEqual(None, msgutil.receive_message(request))
-
-    def test_receive_message_client_using_smaller_window(self):
-        """Test that frames coming from a client which is using smaller window
-        size that the server are correctly received.
-        """
-
-        # Using the smallest window bits of 8 for generating input frames.
-        compress = zlib.compressobj(
-            zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED, -8)
-
-        data = ''
-
-        # Use a frame whose content is bigger than the clients' DEFLATE window
-        # size before compression. The content mainly consists of 'a' but
-        # repetition of 'b' is put at the head and tail so that if the window
-        # size is big, the head is back-referenced but if small, not.
-        payload = 'b' * 64 + 'a' * 1024 + 'b' * 64
-        compressed_hello = compress.compress(payload)
-        compressed_hello += compress.flush(zlib.Z_SYNC_FLUSH)
-        compressed_hello = compressed_hello[:-4]
-        data += '\xc1%c' % (len(compressed_hello) | 0x80)
-        data += _mask_hybi(compressed_hello)
-
-        # Close frame
-        data += '\x88\x8a' + _mask_hybi(struct.pack('!H', 1000) + 'Good bye')
-
-        extension = common.ExtensionParameter(common.DEFLATE_FRAME_EXTENSION)
-        request = _create_request_from_rawdata(
-            data, deflate_frame_request=extension)
-        self.assertEqual(payload, msgutil.receive_message(request))
-
-        self.assertEqual(None, msgutil.receive_message(request))
-
-    def test_receive_message_comp_bit(self):
-        compress = zlib.compressobj(
-            zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED, -zlib.MAX_WBITS)
-
-        data = ''
-
-        compressed_hello = compress.compress('Hello')
-        compressed_hello += compress.flush(zlib.Z_SYNC_FLUSH)
-        compressed_hello = compressed_hello[:-4]
-        data += '\xc1%c' % (len(compressed_hello) | 0x80)
-        data += _mask_hybi(compressed_hello)
-
-        data += '\x81\x85' + _mask_hybi('Hello')
-
-        compress = zlib.compressobj(
-            zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED, -zlib.MAX_WBITS)
-
-        compressed_2nd_hello = compress.compress('Hello')
-        compressed_2nd_hello += compress.flush(zlib.Z_SYNC_FLUSH)
-        compressed_2nd_hello = compressed_2nd_hello[:-4]
-        data += '\xc1%c' % (len(compressed_2nd_hello) | 0x80)
-        data += _mask_hybi(compressed_2nd_hello)
-
-        extension = common.ExtensionParameter(common.DEFLATE_FRAME_EXTENSION)
-        request = _create_request_from_rawdata(
-            data, deflate_frame_request=extension)
-        for i in xrange(3):
-            self.assertEqual('Hello', msgutil.receive_message(request))
-
-    def test_receive_message_various_btype(self):
-        compress = zlib.compressobj(
-            zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED, -zlib.MAX_WBITS)
-
-        data = ''
-
-        compressed_hello = compress.compress('Hello')
-        compressed_hello += compress.flush(zlib.Z_SYNC_FLUSH)
-        compressed_hello = compressed_hello[:-4]
-        data += '\xc1%c' % (len(compressed_hello) | 0x80)
-        data += _mask_hybi(compressed_hello)
-
-        compressed_websocket = compress.compress('WebSocket')
-        compressed_websocket += compress.flush(zlib.Z_FINISH)
-        compressed_websocket += '\x00'
-        data += '\xc1%c' % (len(compressed_websocket) | 0x80)
-        data += _mask_hybi(compressed_websocket)
-
-        compress = zlib.compressobj(
-            zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED, -zlib.MAX_WBITS)
-
-        compressed_world = compress.compress('World')
-        compressed_world += compress.flush(zlib.Z_SYNC_FLUSH)
-        compressed_world = compressed_world[:-4]
-        data += '\xc1%c' % (len(compressed_world) | 0x80)
-        data += _mask_hybi(compressed_world)
-
-        # Close frame
-        data += '\x88\x8a' + _mask_hybi(struct.pack('!H', 1000) + 'Good bye')
-
-        extension = common.ExtensionParameter(common.DEFLATE_FRAME_EXTENSION)
-        request = _create_request_from_rawdata(
-            data, deflate_frame_request=extension)
-        self.assertEqual('Hello', msgutil.receive_message(request))
-        self.assertEqual('WebSocket', msgutil.receive_message(request))
-        self.assertEqual('World', msgutil.receive_message(request))
-
-        self.assertEqual(None, msgutil.receive_message(request))
-
-
-class PerMessageDeflateTest(unittest.TestCase):
-    """Tests for permessage-deflate extension."""
-
-    def test_response_parameters(self):
-        extension = common.ExtensionParameter(
-            common.PERMESSAGE_DEFLATE_EXTENSION)
-        extension.add_parameter('server_no_context_takeover', None)
-        processor = PerMessageDeflateExtensionProcessor(extension)
-        response = processor.get_extension_response()
-        self.assertTrue(
-            response.has_parameter('server_no_context_takeover'))
-        self.assertEqual(
-            None, response.get_parameter_value('server_no_context_takeover'))
-
-        extension = common.ExtensionParameter(
-            common.PERMESSAGE_DEFLATE_EXTENSION)
-        extension.add_parameter('client_max_window_bits', None)
-        processor = PerMessageDeflateExtensionProcessor(extension)
-
-        processor.set_client_max_window_bits(8)
-        processor.set_client_no_context_takeover(True)
-        response = processor.get_extension_response()
-        self.assertEqual(
-            '8', response.get_parameter_value('client_max_window_bits'))
-        self.assertTrue(
-            response.has_parameter('client_no_context_takeover'))
-        self.assertEqual(
-            None,
-            response.get_parameter_value('client_no_context_takeover'))
-
-    def test_send_message(self):
-        extension = common.ExtensionParameter(
-                common.PERMESSAGE_DEFLATE_EXTENSION)
-        request = _create_request_from_rawdata(
-                '', permessage_deflate_request=extension)
-        msgutil.send_message(request, 'Hello')
-
-        compress = zlib.compressobj(
-                zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED, -zlib.MAX_WBITS)
-        compressed_hello = compress.compress('Hello')
-        compressed_hello += compress.flush(zlib.Z_SYNC_FLUSH)
-        compressed_hello = compressed_hello[:-4]
-        expected = '\xc1%c' % len(compressed_hello)
-        expected += compressed_hello
-        self.assertEqual(expected, request.connection.written_data())
-
-    def test_send_empty_message(self):
-        """Test that an empty message is compressed correctly."""
-
-        extension = common.ExtensionParameter(
-                common.PERMESSAGE_DEFLATE_EXTENSION)
-        request = _create_request_from_rawdata(
-                '', permessage_deflate_request=extension)
-
-        msgutil.send_message(request, '')
-
-        # Payload in binary: 0b00000000
-        # From LSB,
-        # - 1 bit of BFINAL (0)
-        # - 2 bits of BTYPE (no compression)
-        # - 5 bits of padding
-        self.assertEqual('\xc1\x01\x00',
-                         request.connection.written_data())
-
-    def test_send_message_with_null_character(self):
-        """Test that a simple payload (one null) is framed correctly."""
-
-        extension = common.ExtensionParameter(
-                common.PERMESSAGE_DEFLATE_EXTENSION)
-        request = _create_request_from_rawdata(
-                '', permessage_deflate_request=extension)
-
-        msgutil.send_message(request, '\x00')
-
-        # Payload in binary: 0b01100010 0b00000000 0b00000000
-        # From LSB,
-        # - 1 bit of BFINAL (0)
-        # - 2 bits of BTYPE (01 that means fixed Huffman)
-        # - 8 bits of the first code (00110000 that is the code for the literal
-        #   alphabet 0x00)
-        # - 7 bits of the second code (0000000 that is the code for the
-        #   end-of-block)
-        # - 1 bit of BFINAL (0)
-        # - 2 bits of BTYPE (no compression)
-        # - 2 bits of padding
-        self.assertEqual('\xc1\x03\x62\x00\x00',
-                         request.connection.written_data())
-
-    def test_send_two_messages(self):
-        extension = common.ExtensionParameter(
-                common.PERMESSAGE_DEFLATE_EXTENSION)
-        request = _create_request_from_rawdata(
-                '', permessage_deflate_request=extension)
-        msgutil.send_message(request, 'Hello')
-        msgutil.send_message(request, 'World')
-
-        compress = zlib.compressobj(
-                zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED, -zlib.MAX_WBITS)
-
-        expected = ''
-
-        compressed_hello = compress.compress('Hello')
-        compressed_hello += compress.flush(zlib.Z_SYNC_FLUSH)
-        compressed_hello = compressed_hello[:-4]
-        expected += '\xc1%c' % len(compressed_hello)
-        expected += compressed_hello
-
-        compressed_world = compress.compress('World')
-        compressed_world += compress.flush(zlib.Z_SYNC_FLUSH)
-        compressed_world = compressed_world[:-4]
-        expected += '\xc1%c' % len(compressed_world)
-        expected += compressed_world
-
-        self.assertEqual(expected, request.connection.written_data())
-
-    def test_send_message_fragmented(self):
-        extension = common.ExtensionParameter(
-                common.PERMESSAGE_DEFLATE_EXTENSION)
-        request = _create_request_from_rawdata(
-                '', permessage_deflate_request=extension)
-        msgutil.send_message(request, 'Hello', end=False)
-        msgutil.send_message(request, 'Goodbye', end=False)
-        msgutil.send_message(request, 'World')
-
-        compress = zlib.compressobj(
-                zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED, -zlib.MAX_WBITS)
-        compressed_hello = compress.compress('Hello')
-        compressed_hello += compress.flush(zlib.Z_SYNC_FLUSH)
-        expected = '\x41%c' % len(compressed_hello)
-        expected += compressed_hello
-        compressed_goodbye = compress.compress('Goodbye')
-        compressed_goodbye += compress.flush(zlib.Z_SYNC_FLUSH)
-        expected += '\x00%c' % len(compressed_goodbye)
-        expected += compressed_goodbye
-        compressed_world = compress.compress('World')
-        compressed_world += compress.flush(zlib.Z_SYNC_FLUSH)
-        compressed_world = compressed_world[:-4]
-        expected += '\x80%c' % len(compressed_world)
-        expected += compressed_world
-        self.assertEqual(expected, request.connection.written_data())
-
-    def test_send_message_fragmented_empty_first_frame(self):
-        extension = common.ExtensionParameter(
-                common.PERMESSAGE_DEFLATE_EXTENSION)
-        request = _create_request_from_rawdata(
-                '', permessage_deflate_request=extension)
-        msgutil.send_message(request, '', end=False)
-        msgutil.send_message(request, 'Hello')
-
-        compress = zlib.compressobj(
-                zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED, -zlib.MAX_WBITS)
-        compressed_hello = compress.compress('')
-        compressed_hello += compress.flush(zlib.Z_SYNC_FLUSH)
-        expected = '\x41%c' % len(compressed_hello)
-        expected += compressed_hello
-        compressed_empty = compress.compress('Hello')
-        compressed_empty += compress.flush(zlib.Z_SYNC_FLUSH)
-        compressed_empty = compressed_empty[:-4]
-        expected += '\x80%c' % len(compressed_empty)
-        expected += compressed_empty
-        print('%r' % expected)
-        self.assertEqual(expected, request.connection.written_data())
-
-    def test_send_message_fragmented_empty_last_frame(self):
-        extension = common.ExtensionParameter(
-                common.PERMESSAGE_DEFLATE_EXTENSION)
-        request = _create_request_from_rawdata(
-                '', permessage_deflate_request=extension)
-        msgutil.send_message(request, 'Hello', end=False)
-        msgutil.send_message(request, '')
-
-        compress = zlib.compressobj(
-                zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED, -zlib.MAX_WBITS)
-        compressed_hello = compress.compress('Hello')
-        compressed_hello += compress.flush(zlib.Z_SYNC_FLUSH)
-        expected = '\x41%c' % len(compressed_hello)
-        expected += compressed_hello
-        compressed_empty = compress.compress('')
-        compressed_empty += compress.flush(zlib.Z_SYNC_FLUSH)
-        compressed_empty = compressed_empty[:-4]
-        expected += '\x80%c' % len(compressed_empty)
-        expected += compressed_empty
-        self.assertEqual(expected, request.connection.written_data())
-
-    def test_send_message_using_small_window(self):
-        common_part = 'abcdefghijklmnopqrstuvwxyz'
-        test_message = common_part + '-' * 30000 + common_part
-
-        extension = common.ExtensionParameter(
-                common.PERMESSAGE_DEFLATE_EXTENSION)
-        extension.add_parameter('server_max_window_bits', '8')
-        request = _create_request_from_rawdata(
-                '', permessage_deflate_request=extension)
-        msgutil.send_message(request, test_message)
-
-        expected_websocket_header_size = 2
-        expected_websocket_payload_size = 91
-
-        actual_frame = request.connection.written_data()
-        self.assertEqual(expected_websocket_header_size +
-                         expected_websocket_payload_size,
-                         len(actual_frame))
-        actual_header = actual_frame[0:expected_websocket_header_size]
-        actual_payload = actual_frame[expected_websocket_header_size:]
-
-        self.assertEqual(
-                '\xc1%c' % expected_websocket_payload_size, actual_header)
-        decompress = zlib.decompressobj(-8)
-        decompressed_message = decompress.decompress(
-                actual_payload + '\x00\x00\xff\xff')
-        decompressed_message += decompress.flush()
-        self.assertEqual(test_message, decompressed_message)
-        self.assertEqual(0, len(decompress.unused_data))
-        self.assertEqual(0, len(decompress.unconsumed_tail))
-
-    def test_send_message_no_context_takeover_parameter(self):
-        extension = common.ExtensionParameter(
-                common.PERMESSAGE_DEFLATE_EXTENSION)
-        extension.add_parameter('server_no_context_takeover', None)
-        request = _create_request_from_rawdata(
-                '', permessage_deflate_request=extension)
-        for i in xrange(3):
-            msgutil.send_message(request, 'Hello', end=False)
-            msgutil.send_message(request, 'Hello', end=True)
-
-        compress = zlib.compressobj(
-                zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED, -zlib.MAX_WBITS)
-
-        first_hello = compress.compress('Hello')
-        first_hello += compress.flush(zlib.Z_SYNC_FLUSH)
-        expected = '\x41%c' % len(first_hello)
-        expected += first_hello
-        second_hello = compress.compress('Hello')
-        second_hello += compress.flush(zlib.Z_SYNC_FLUSH)
-        second_hello = second_hello[:-4]
-        expected += '\x80%c' % len(second_hello)
-        expected += second_hello
-
-        self.assertEqual(
-                expected + expected + expected,
-                request.connection.written_data())
-
-    def test_send_message_fragmented_bfinal(self):
-        extension = common.ExtensionParameter(
-                common.PERMESSAGE_DEFLATE_EXTENSION)
-        request = _create_request_from_rawdata(
-                '', permessage_deflate_request=extension)
-        self.assertEquals(1, len(request.ws_extension_processors))
-        request.ws_extension_processors[0].set_bfinal(True)
-        msgutil.send_message(request, 'Hello', end=False)
-        msgutil.send_message(request, 'World', end=True)
-
-        expected = ''
-
-        compress = zlib.compressobj(
-            zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED, -zlib.MAX_WBITS)
-        compressed_hello = compress.compress('Hello')
-        compressed_hello += compress.flush(zlib.Z_FINISH)
-        compressed_hello = compressed_hello + chr(0)
-        expected += '\x41%c' % len(compressed_hello)
-        expected += compressed_hello
-
-        compress = zlib.compressobj(
-            zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED, -zlib.MAX_WBITS)
-        compressed_world = compress.compress('World')
-        compressed_world += compress.flush(zlib.Z_FINISH)
-        compressed_world = compressed_world + chr(0)
-        expected += '\x80%c' % len(compressed_world)
-        expected += compressed_world
-
-        self.assertEqual(expected, request.connection.written_data())
-
-    def test_receive_message_deflate(self):
-        compress = zlib.compressobj(
-            zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED, -zlib.MAX_WBITS)
-
-        compressed_hello = compress.compress('Hello')
-        compressed_hello += compress.flush(zlib.Z_SYNC_FLUSH)
-        compressed_hello = compressed_hello[:-4]
-        data = '\xc1%c' % (len(compressed_hello) | 0x80)
-        data += _mask_hybi(compressed_hello)
-
-        # Close frame
-        data += '\x88\x8a' + _mask_hybi(struct.pack('!H', 1000) + 'Good bye')
-
-        extension = common.ExtensionParameter(
-                common.PERMESSAGE_DEFLATE_EXTENSION)
-        request = _create_request_from_rawdata(
-                data, permessage_deflate_request=extension)
-        self.assertEqual('Hello', msgutil.receive_message(request))
-
-        self.assertEqual(None, msgutil.receive_message(request))
-
-    def test_receive_message_random_section(self):
-        """Test that a compressed message fragmented into lots of chunks is
-        correctly received.
-        """
-
-        random.seed(a=0)
-        payload = ''.join(
-            [chr(random.randint(0, 255)) for i in xrange(1000)])
-
-        compress = zlib.compressobj(
-            zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED, -zlib.MAX_WBITS)
-        compressed_payload = compress.compress(payload)
-        compressed_payload += compress.flush(zlib.Z_SYNC_FLUSH)
-        compressed_payload = compressed_payload[:-4]
-
-        # Fragment the compressed payload into lots of frames.
-        bytes_chunked = 0
-        data = ''
-        frame_count = 0
-
-        chunk_sizes = []
-
-        while bytes_chunked < len(compressed_payload):
-            # Make sure that
-            # - the length of chunks are equal or less than 125 so that we can
-            #   use 1 octet length header format for all frames.
-            # - at least 10 chunks are created.
-            chunk_size = random.randint(
-                1, min(125,
-                       len(compressed_payload) / 10,
-                       len(compressed_payload) - bytes_chunked))
-            chunk_sizes.append(chunk_size)
-            chunk = compressed_payload[
-                bytes_chunked:bytes_chunked + chunk_size]
-            bytes_chunked += chunk_size
-
-            first_octet = 0x00
-            if len(data) == 0:
-                first_octet = first_octet | 0x42
-            if bytes_chunked == len(compressed_payload):
-                first_octet = first_octet | 0x80
-
-            data += '%c%c' % (first_octet, chunk_size | 0x80)
-            data += _mask_hybi(chunk)
-
-            frame_count += 1
-
-        print("Chunk sizes: %r" % chunk_sizes)
-        self.assertTrue(len(chunk_sizes) > 10)
-
-        # Close frame
-        data += '\x88\x8a' + _mask_hybi(struct.pack('!H', 1000) + 'Good bye')
-
-        extension = common.ExtensionParameter(
-            common.PERMESSAGE_DEFLATE_EXTENSION)
-        request = _create_request_from_rawdata(
-            data, permessage_deflate_request=extension)
-        self.assertEqual(payload, msgutil.receive_message(request))
-
-        self.assertEqual(None, msgutil.receive_message(request))
-
-    def test_receive_two_messages(self):
-        compress = zlib.compressobj(
-                zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED, -zlib.MAX_WBITS)
-
-        data = ''
-
-        compressed_hello = compress.compress('HelloWebSocket')
-        compressed_hello += compress.flush(zlib.Z_SYNC_FLUSH)
-        compressed_hello = compressed_hello[:-4]
-        split_position = len(compressed_hello) / 2
-        data += '\x41%c' % (split_position | 0x80)
-        data += _mask_hybi(compressed_hello[:split_position])
-
-        data += '\x80%c' % ((len(compressed_hello) - split_position) | 0x80)
-        data += _mask_hybi(compressed_hello[split_position:])
-
-        compress = zlib.compressobj(
-                zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED, -zlib.MAX_WBITS)
-
-        compressed_world = compress.compress('World')
-        compressed_world += compress.flush(zlib.Z_SYNC_FLUSH)
-        compressed_world = compressed_world[:-4]
-        data += '\xc1%c' % (len(compressed_world) | 0x80)
-        data += _mask_hybi(compressed_world)
-
-        # Close frame
-        data += '\x88\x8a' + _mask_hybi(struct.pack('!H', 1000) + 'Good bye')
-
-        extension = common.ExtensionParameter(
-                common.PERMESSAGE_DEFLATE_EXTENSION)
-        request = _create_request_from_rawdata(
-                data, permessage_deflate_request=extension)
-        self.assertEqual('HelloWebSocket', msgutil.receive_message(request))
-        self.assertEqual('World', msgutil.receive_message(request))
-
-        self.assertEqual(None, msgutil.receive_message(request))
-
-    def test_receive_message_mixed_btype(self):
-        """Test that a message compressed using lots of DEFLATE blocks with
-        various flush mode is correctly received.
-        """
-
-        random.seed(a=0)
-        payload = ''.join(
-            [chr(random.randint(0, 255)) for i in xrange(1000)])
-
-        compress = None
-
-        # Fragment the compressed payload into lots of frames.
-        bytes_chunked = 0
-        compressed_payload = ''
-
-        chunk_sizes = []
-        methods = []
-        sync_used = False
-        finish_used = False
-
-        while bytes_chunked < len(payload):
-            # Make sure at least 10 chunks are created.
-            chunk_size = random.randint(
-                1, min(100, len(payload) - bytes_chunked))
-            chunk_sizes.append(chunk_size)
-            chunk = payload[bytes_chunked:bytes_chunked + chunk_size]
-
-            bytes_chunked += chunk_size
-
-            if compress is None:
-                compress = zlib.compressobj(
-                    zlib.Z_DEFAULT_COMPRESSION,
-                    zlib.DEFLATED,
-                    -zlib.MAX_WBITS)
-
-            if bytes_chunked == len(payload):
-                compressed_payload += compress.compress(chunk)
-                compressed_payload += compress.flush(zlib.Z_SYNC_FLUSH)
-                compressed_payload = compressed_payload[:-4]
-            else:
-                method = random.randint(0, 1)
-                methods.append(method)
-                if method == 0:
-                    compressed_payload += compress.compress(chunk)
-                    compressed_payload += compress.flush(zlib.Z_SYNC_FLUSH)
-                    sync_used = True
-                else:
-                    compressed_payload += compress.compress(chunk)
-                    compressed_payload += compress.flush(zlib.Z_FINISH)
-                    compress = None
-                    finish_used = True
-
-        print("Chunk sizes: %r" % chunk_sizes)
-        self.assertTrue(len(chunk_sizes) > 10)
-        print("Methods: %r" % methods)
-        self.assertTrue(sync_used)
-        self.assertTrue(finish_used)
-
-        self.assertTrue(125 < len(compressed_payload))
-        self.assertTrue(len(compressed_payload) < 65536)
-        data = '\xc2\xfe' + struct.pack('!H', len(compressed_payload))
-        data += _mask_hybi(compressed_payload)
-
-        # Close frame
-        data += '\x88\x8a' + _mask_hybi(struct.pack('!H', 1000) + 'Good bye')
-
-        extension = common.ExtensionParameter(
-            common.PERMESSAGE_DEFLATE_EXTENSION)
-        request = _create_request_from_rawdata(
-            data, permessage_deflate_request=extension)
-        self.assertEqual(payload, msgutil.receive_message(request))
-
-        self.assertEqual(None, msgutil.receive_message(request))
-
-
-class MessageTestHixie75(unittest.TestCase):
-    """Tests for draft-hixie-thewebsocketprotocol-76 stream class."""
-
-    def test_send_message(self):
-        request = _create_request_hixie75()
-        msgutil.send_message(request, 'Hello')
-        self.assertEqual('\x00Hello\xff', request.connection.written_data())
-
-    def test_send_message_unicode(self):
-        request = _create_request_hixie75()
-        msgutil.send_message(request, u'\u65e5')
-        # U+65e5 is encoded as e6,97,a5 in UTF-8
-        self.assertEqual('\x00\xe6\x97\xa5\xff',
-                         request.connection.written_data())
-
-    def test_receive_message(self):
-        request = _create_request_hixie75('\x00Hello\xff\x00World!\xff')
-        self.assertEqual('Hello', msgutil.receive_message(request))
-        self.assertEqual('World!', msgutil.receive_message(request))
-
-    def test_receive_message_unicode(self):
-        request = _create_request_hixie75('\x00\xe6\x9c\xac\xff')
-        # U+672c is encoded as e6,9c,ac in UTF-8
-        self.assertEqual(u'\u672c', msgutil.receive_message(request))
-
-    def test_receive_message_erroneous_unicode(self):
-        # \x80 and \x81 are invalid as UTF-8.
-        request = _create_request_hixie75('\x00\x80\x81\xff')
-        # Invalid characters should be replaced with
-        # U+fffd REPLACEMENT CHARACTER
-        self.assertEqual(u'\ufffd\ufffd', msgutil.receive_message(request))
-
-    def test_receive_message_discard(self):
-        request = _create_request_hixie75('\x80\x06IGNORE\x00Hello\xff'
-                                          '\x01DISREGARD\xff\x00World!\xff')
-        self.assertEqual('Hello', msgutil.receive_message(request))
-        self.assertEqual('World!', msgutil.receive_message(request))
-
-
-class MessageReceiverTest(unittest.TestCase):
-    """Tests the Stream class using MessageReceiver."""
-
-    def test_queue(self):
-        request = _create_blocking_request()
-        receiver = msgutil.MessageReceiver(request)
-
-        self.assertEqual(None, receiver.receive_nowait())
-
-        request.connection.put_bytes('\x81\x86' + _mask_hybi('Hello!'))
-        self.assertEqual('Hello!', receiver.receive())
-
-    def test_onmessage(self):
-        onmessage_queue = Queue.Queue()
-
-        def onmessage_handler(message):
-            onmessage_queue.put(message)
-
-        request = _create_blocking_request()
-        receiver = msgutil.MessageReceiver(request, onmessage_handler)
-
-        request.connection.put_bytes('\x81\x86' + _mask_hybi('Hello!'))
-        self.assertEqual('Hello!', onmessage_queue.get())
-
-
-class MessageReceiverHixie75Test(unittest.TestCase):
-    """Tests the StreamHixie75 class using MessageReceiver."""
-
-    def test_queue(self):
-        request = _create_blocking_request_hixie75()
-        receiver = msgutil.MessageReceiver(request)
-
-        self.assertEqual(None, receiver.receive_nowait())
-
-        request.connection.put_bytes('\x00Hello!\xff')
-        self.assertEqual('Hello!', receiver.receive())
-
-    def test_onmessage(self):
-        onmessage_queue = Queue.Queue()
-
-        def onmessage_handler(message):
-            onmessage_queue.put(message)
-
-        request = _create_blocking_request_hixie75()
-        receiver = msgutil.MessageReceiver(request, onmessage_handler)
-
-        request.connection.put_bytes('\x00Hello!\xff')
-        self.assertEqual('Hello!', onmessage_queue.get())
-
-
-class MessageSenderTest(unittest.TestCase):
-    """Tests the Stream class using MessageSender."""
-
-    def test_send(self):
-        request = _create_blocking_request()
-        sender = msgutil.MessageSender(request)
-
-        sender.send('World')
-        self.assertEqual('\x81\x05World', request.connection.written_data())
-
-    def test_send_nowait(self):
-        # Use a queue to check the bytes written by MessageSender.
-        # request.connection.written_data() cannot be used here because
-        # MessageSender runs in a separate thread.
-        send_queue = Queue.Queue()
-
-        def write(bytes):
-            send_queue.put(bytes)
-
-        request = _create_blocking_request()
-        request.connection.write = write
-
-        sender = msgutil.MessageSender(request)
-
-        sender.send_nowait('Hello')
-        sender.send_nowait('World')
-        self.assertEqual('\x81\x05Hello', send_queue.get())
-        self.assertEqual('\x81\x05World', send_queue.get())
-
-
-class MessageSenderHixie75Test(unittest.TestCase):
-    """Tests the StreamHixie75 class using MessageSender."""
-
-    def test_send(self):
-        request = _create_blocking_request_hixie75()
-        sender = msgutil.MessageSender(request)
-
-        sender.send('World')
-        self.assertEqual('\x00World\xff', request.connection.written_data())
-
-    def test_send_nowait(self):
-        # Use a queue to check the bytes written by MessageSender.
-        # request.connection.written_data() cannot be used here because
-        # MessageSender runs in a separate thread.
-        send_queue = Queue.Queue()
-
-        def write(bytes):
-            send_queue.put(bytes)
-
-        request = _create_blocking_request_hixie75()
-        request.connection.write = write
-
-        sender = msgutil.MessageSender(request)
-
-        sender.send_nowait('Hello')
-        sender.send_nowait('World')
-        self.assertEqual('\x00Hello\xff', send_queue.get())
-        self.assertEqual('\x00World\xff', send_queue.get())
-
-
-if __name__ == '__main__':
-    unittest.main()
-
-
-# vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_mux.py b/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_mux.py
deleted file mode 100644
index 0773decbfd6..00000000000
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_mux.py
+++ /dev/null
@@ -1,2088 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2012, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-"""Tests for mux module."""
-
-import Queue
-import copy
-import logging
-import optparse
-import struct
-import sys
-import unittest
-import time
-import zlib
-
-import set_sys_path  # Update sys.path to locate mod_pywebsocket module.
-
-from mod_pywebsocket import common
-from mod_pywebsocket import mux
-from mod_pywebsocket._stream_base import ConnectionTerminatedException
-from mod_pywebsocket._stream_base import UnsupportedFrameException
-from mod_pywebsocket._stream_hybi import Frame
-from mod_pywebsocket._stream_hybi import Stream
-from mod_pywebsocket._stream_hybi import StreamOptions
-from mod_pywebsocket._stream_hybi import create_binary_frame
-from mod_pywebsocket._stream_hybi import create_close_frame
-from mod_pywebsocket._stream_hybi import create_closing_handshake_body
-from mod_pywebsocket._stream_hybi import parse_frame
-from mod_pywebsocket.extensions import MuxExtensionProcessor
-
-
-import mock
-
-
-_TEST_HEADERS = {'Host': 'server.example.com',
-                 'Upgrade': 'websocket',
-                 'Connection': 'Upgrade',
-                 'Sec-WebSocket-Key': 'dGhlIHNhbXBsZSBub25jZQ==',
-                 'Sec-WebSocket-Version': '13',
-                 'Origin': 'http://example.com'}
-
-
-class _OutgoingChannelData(object):
-    def __init__(self):
-        self.messages = []
-        self.control_messages = []
-
-        self.builder = mux._InnerMessageBuilder()
-
-class _MockMuxConnection(mock.MockBlockingConn):
-    """Mock class of mod_python connection for mux."""
-
-    def __init__(self):
-        mock.MockBlockingConn.__init__(self)
-        self._control_blocks = []
-        self._channel_data = {}
-
-        self._current_opcode = None
-        self._pending_fragments = []
-
-        self.server_close_code = None
-
-    def write(self, data):
-        """Override MockBlockingConn.write."""
-
-        self._current_data = data
-        self._position = 0
-
-        def _receive_bytes(length):
-            if self._position + length > len(self._current_data):
-                raise ConnectionTerminatedException(
-                    'Failed to receive %d bytes from encapsulated '
-                    'frame' % length)
-            data = self._current_data[self._position:self._position+length]
-            self._position += length
-            return data
-
-        # Parse physical frames and assemble a message if the message is
-        # fragmented.
-        opcode, payload, fin, rsv1, rsv2, rsv3 = (
-            parse_frame(_receive_bytes, unmask_receive=False))
-
-        self._pending_fragments.append(payload)
-
-        if self._current_opcode is None:
-            if opcode == common.OPCODE_CONTINUATION:
-                raise Exception('Sending invalid continuation opcode')
-            self._current_opcode = opcode
-        else:
-            if opcode != common.OPCODE_CONTINUATION:
-                raise Exception('Sending invalid opcode %d' % opcode)
-        if not fin:
-            return
-
-        inner_frame_data = ''.join(self._pending_fragments)
-        self._pending_fragments = []
-        self._current_opcode = None
-
-        # Handle a control message on the physical channel.
-        # TODO(bashi): Support other opcodes if needed.
-        if opcode == common.OPCODE_CLOSE:
-            if len(payload) >= 2:
-                self.server_close_code = struct.unpack('!H', payload[:2])[0]
-            close_body = create_closing_handshake_body(
-                common.STATUS_NORMAL_CLOSURE, '')
-            close_frame = create_close_frame(close_body, mask=True)
-            self.put_bytes(close_frame)
-            return
-
-        # Parse the payload of the message on physical channel.
-        parser = mux._MuxFramePayloadParser(inner_frame_data)
-        channel_id = parser.read_channel_id()
-        if channel_id == mux._CONTROL_CHANNEL_ID:
-            self._control_blocks.extend(list(parser.read_control_blocks()))
-            return
-
-        if not channel_id in self._channel_data:
-            self._channel_data[channel_id] = _OutgoingChannelData()
-        channel_data = self._channel_data[channel_id]
-
-        # Parse logical frames and assemble an inner (logical) message.
-        (inner_fin, inner_rsv1, inner_rsv2, inner_rsv3, inner_opcode,
-         inner_payload) = parser.read_inner_frame()
-        inner_frame = Frame(inner_fin, inner_rsv1, inner_rsv2, inner_rsv3,
-                            inner_opcode, inner_payload)
-        message = channel_data.builder.build(inner_frame)
-        if message is None:
-            return
-
-        if (message.opcode == common.OPCODE_TEXT or
-            message.opcode == common.OPCODE_BINARY):
-            channel_data.messages.append(message.payload)
-
-            self.on_data_message(message.payload)
-        else:
-            channel_data.control_messages.append(
-                {'opcode': message.opcode,
-                 'message': message.payload})
-
-    def on_data_message(self, message):
-        pass
-
-    def get_written_control_blocks(self):
-        return self._control_blocks
-
-    def get_written_messages(self, channel_id):
-        return self._channel_data[channel_id].messages
-
-    def get_written_control_messages(self, channel_id):
-        return self._channel_data[channel_id].control_messages
-
-
-class _FailOnWriteConnection(_MockMuxConnection):
-    """Specicialized version of _MockMuxConnection. Its write() method raises
-    an exception for testing when a data message is written.
-    """
-
-    def on_data_message(self, message):
-        """Override to raise an exception."""
-
-        raise Exception('Intentional failure')
-
-
-class _ChannelEvent(object):
-    """A structure that records channel events."""
-
-    def __init__(self):
-        self.request = None
-        self.messages = []
-        self.exception = None
-        self.client_initiated_closing = False
-
-
-class _MuxMockDispatcher(object):
-    """Mock class of dispatch.Dispatcher for mux."""
-
-    def __init__(self):
-        self.channel_events = {}
-
-    def do_extra_handshake(self, request):
-        if request.ws_requested_protocols is not None:
-            request.ws_protocol = request.ws_requested_protocols[0]
-
-    def _do_echo(self, request, channel_events):
-        while True:
-            message = request.ws_stream.receive_message()
-            if message == None:
-                channel_events.client_initiated_closing = True
-                return
-            if message == 'Goodbye':
-                return
-            channel_events.messages.append(message)
-            # echo back
-            request.ws_stream.send_message(message)
-
-    def _do_ping(self, request, channel_events):
-        request.ws_stream.send_ping('Ping!')
-
-    def _do_ping_while_hello_world(self, request, channel_events):
-        request.ws_stream.send_message('Hello ', end=False)
-        request.ws_stream.send_ping('Ping!')
-        request.ws_stream.send_message('World!', end=True)
-
-    def _do_two_ping_while_hello_world(self, request, channel_events):
-        request.ws_stream.send_message('Hello ', end=False)
-        request.ws_stream.send_ping('Ping!')
-        request.ws_stream.send_ping('Pong!')
-        request.ws_stream.send_message('World!', end=True)
-
-    def transfer_data(self, request):
-        self.channel_events[request.channel_id] = _ChannelEvent()
-        self.channel_events[request.channel_id].request = request
-
-        try:
-            # Note: more handler will be added.
-            if request.uri.endswith('echo'):
-                self._do_echo(request,
-                              self.channel_events[request.channel_id])
-            elif request.uri.endswith('ping'):
-                self._do_ping(request,
-                              self.channel_events[request.channel_id])
-            elif request.uri.endswith('two_ping_while_hello_world'):
-                self._do_two_ping_while_hello_world(
-                    request, self.channel_events[request.channel_id])
-            elif request.uri.endswith('ping_while_hello_world'):
-                self._do_ping_while_hello_world(
-                    request, self.channel_events[request.channel_id])
-            else:
-                raise ValueError('Cannot handle path %r' % request.path)
-            if not request.server_terminated:
-                request.ws_stream.close_connection()
-        except ConnectionTerminatedException as e:
-            self.channel_events[request.channel_id].exception = e
-        except Exception as e:
-            self.channel_events[request.channel_id].exception = e
-            raise
-
-
-def _create_mock_request(connection=None, logical_channel_extensions=None):
-    if connection is None:
-        connection = _MockMuxConnection()
-
-    request = mock.MockRequest(uri='/echo',
-                               headers_in=_TEST_HEADERS,
-                               connection=connection)
-    request.ws_stream = Stream(request, options=StreamOptions())
-    request.mux_processor = MuxExtensionProcessor(
-        common.ExtensionParameter(common.MUX_EXTENSION))
-    if logical_channel_extensions is not None:
-        request.mux_processor.set_extensions(logical_channel_extensions)
-    request.mux_processor.set_quota(8 * 1024)
-    return request
-
-
-def _create_add_channel_request_frame(channel_id, encoding, encoded_handshake):
-    # Allow invalid encoding for testing.
-    first_byte = ((mux._MUX_OPCODE_ADD_CHANNEL_REQUEST << 5) | encoding)
-    payload = (chr(first_byte) +
-               mux._encode_channel_id(channel_id) +
-               mux._encode_number(len(encoded_handshake)) +
-               encoded_handshake)
-    return create_binary_frame(
-        (mux._encode_channel_id(mux._CONTROL_CHANNEL_ID) + payload), mask=True)
-
-
-def _create_drop_channel_frame(channel_id, code=None, message=''):
-    payload = mux._create_drop_channel(channel_id, code, message)
-    return create_binary_frame(
-        (mux._encode_channel_id(mux._CONTROL_CHANNEL_ID) + payload), mask=True)
-
-
-def _create_flow_control_frame(channel_id, replenished_quota):
-    payload = mux._create_flow_control(channel_id, replenished_quota)
-    return create_binary_frame(
-        (mux._encode_channel_id(mux._CONTROL_CHANNEL_ID) + payload), mask=True)
-
-
-def _create_logical_frame(channel_id, message, opcode=common.OPCODE_BINARY,
-                          fin=True, rsv1=False, rsv2=False, rsv3=False,
-                          mask=True):
-    bits = chr((fin << 7) | (rsv1 << 6) | (rsv2 << 5) | (rsv3 << 4) | opcode)
-    payload = mux._encode_channel_id(channel_id) + bits + message
-    return create_binary_frame(payload, mask=True)
-
-
-def _create_request_header(path='/echo', extensions=None):
-    headers = (
-        'GET %s HTTP/1.1\r\n'
-        'Host: server.example.com\r\n'
-        'Connection: Upgrade\r\n'
-        'Origin: http://example.com\r\n') % path
-    if extensions:
-        headers += '%s: %s' % (
-            common.SEC_WEBSOCKET_EXTENSIONS_HEADER, extensions)
-    return headers
-
-
-class MuxTest(unittest.TestCase):
-    """A unittest for mux module."""
-
-    def test_channel_id_decode(self):
-        data = '\x00\x01\xbf\xff\xdf\xff\xff\xff\xff\xff\xff'
-        parser = mux._MuxFramePayloadParser(data)
-        channel_id = parser.read_channel_id()
-        self.assertEqual(0, channel_id)
-        channel_id = parser.read_channel_id()
-        self.assertEqual(1, channel_id)
-        channel_id = parser.read_channel_id()
-        self.assertEqual(2 ** 14 - 1, channel_id)
-        channel_id = parser.read_channel_id()
-        self.assertEqual(2 ** 21 - 1, channel_id)
-        channel_id = parser.read_channel_id()
-        self.assertEqual(2 ** 29 - 1, channel_id)
-        self.assertEqual(len(data), parser._read_position)
-
-    def test_channel_id_encode(self):
-        encoded = mux._encode_channel_id(0)
-        self.assertEqual('\x00', encoded)
-        encoded = mux._encode_channel_id(2 ** 14 - 1)
-        self.assertEqual('\xbf\xff', encoded)
-        encoded = mux._encode_channel_id(2 ** 14)
-        self.assertEqual('\xc0@\x00', encoded)
-        encoded = mux._encode_channel_id(2 ** 21 - 1)
-        self.assertEqual('\xdf\xff\xff', encoded)
-        encoded = mux._encode_channel_id(2 ** 21)
-        self.assertEqual('\xe0 \x00\x00', encoded)
-        encoded = mux._encode_channel_id(2 ** 29 - 1)
-        self.assertEqual('\xff\xff\xff\xff', encoded)
-        # channel_id is too large
-        self.assertRaises(ValueError,
-                          mux._encode_channel_id,
-                          2 ** 29)
-
-    def test_read_multiple_control_blocks(self):
-        # Use AddChannelRequest because it can contain arbitrary length of data
-        data = ('\x00\x01\x01a'
-                '\x00\x02\x7d%s'
-                '\x00\x03\x7e\xff\xff%s'
-                '\x00\x04\x7f\x00\x00\x00\x00\x00\x01\x00\x00%s') % (
-            'a' * 0x7d, 'b' * 0xffff, 'c' * 0x10000)
-        parser = mux._MuxFramePayloadParser(data)
-        blocks = list(parser.read_control_blocks())
-        self.assertEqual(4, len(blocks))
-
-        self.assertEqual(mux._MUX_OPCODE_ADD_CHANNEL_REQUEST, blocks[0].opcode)
-        self.assertEqual(1, blocks[0].channel_id)
-        self.assertEqual(1, len(blocks[0].encoded_handshake))
-
-        self.assertEqual(mux._MUX_OPCODE_ADD_CHANNEL_REQUEST, blocks[1].opcode)
-        self.assertEqual(2, blocks[1].channel_id)
-        self.assertEqual(0x7d, len(blocks[1].encoded_handshake))
-
-        self.assertEqual(mux._MUX_OPCODE_ADD_CHANNEL_REQUEST, blocks[2].opcode)
-        self.assertEqual(3, blocks[2].channel_id)
-        self.assertEqual(0xffff, len(blocks[2].encoded_handshake))
-
-        self.assertEqual(mux._MUX_OPCODE_ADD_CHANNEL_REQUEST, blocks[3].opcode)
-        self.assertEqual(4, blocks[3].channel_id)
-        self.assertEqual(0x10000, len(blocks[3].encoded_handshake))
-
-        self.assertEqual(len(data), parser._read_position)
-
-    def test_read_add_channel_request(self):
-        data = '\x00\x01\x01a'
-        parser = mux._MuxFramePayloadParser(data)
-        blocks = list(parser.read_control_blocks())
-        self.assertEqual(mux._MUX_OPCODE_ADD_CHANNEL_REQUEST, blocks[0].opcode)
-        self.assertEqual(1, blocks[0].channel_id)
-        self.assertEqual(1, len(blocks[0].encoded_handshake))
-
-    def test_read_drop_channel(self):
-        data = '\x60\x01\x00'
-        parser = mux._MuxFramePayloadParser(data)
-        blocks = list(parser.read_control_blocks())
-        self.assertEqual(1, len(blocks))
-        self.assertEqual(1, blocks[0].channel_id)
-        self.assertEqual(mux._MUX_OPCODE_DROP_CHANNEL, blocks[0].opcode)
-        self.assertEqual(None, blocks[0].drop_code)
-        self.assertEqual(0, len(blocks[0].drop_message))
-
-        data = '\x60\x02\x09\x03\xe8Success'
-        parser = mux._MuxFramePayloadParser(data)
-        blocks = list(parser.read_control_blocks())
-        self.assertEqual(1, len(blocks))
-        self.assertEqual(2, blocks[0].channel_id)
-        self.assertEqual(mux._MUX_OPCODE_DROP_CHANNEL, blocks[0].opcode)
-        self.assertEqual(1000, blocks[0].drop_code)
-        self.assertEqual('Success', blocks[0].drop_message)
-
-        # Reason is too short.
-        data = '\x60\x01\x01\x00'
-        parser = mux._MuxFramePayloadParser(data)
-        self.assertRaises(mux.PhysicalConnectionError,
-                          lambda: list(parser.read_control_blocks()))
-
-    def test_read_flow_control(self):
-        data = '\x40\x01\x02'
-        parser = mux._MuxFramePayloadParser(data)
-        blocks = list(parser.read_control_blocks())
-        self.assertEqual(1, len(blocks))
-        self.assertEqual(1, blocks[0].channel_id)
-        self.assertEqual(mux._MUX_OPCODE_FLOW_CONTROL, blocks[0].opcode)
-        self.assertEqual(2, blocks[0].send_quota)
-
-    def test_read_new_channel_slot(self):
-        data = '\x80\x01\x02\x02\x03'
-        parser = mux._MuxFramePayloadParser(data)
-        # TODO(bashi): Implement
-        self.assertRaises(mux.PhysicalConnectionError,
-                          lambda: list(parser.read_control_blocks()))
-
-    def test_read_invalid_number_field_in_control_block(self):
-        # No number field.
-        data = ''
-        parser = mux._MuxFramePayloadParser(data)
-        self.assertRaises(ValueError, parser._read_number)
-
-        # The last two bytes are missing.
-        data = '\x7e'
-        parser = mux._MuxFramePayloadParser(data)
-        self.assertRaises(ValueError, parser._read_number)
-
-        # Missing the last one byte.
-        data = '\x7f\x00\x00\x00\x00\x00\x01\x00'
-        parser = mux._MuxFramePayloadParser(data)
-        self.assertRaises(ValueError, parser._read_number)
-
-        # The length of number field is too large.
-        data = '\x7f\xff\xff\xff\xff\xff\xff\xff\xff'
-        parser = mux._MuxFramePayloadParser(data)
-        self.assertRaises(ValueError, parser._read_number)
-
-        # The msb of the first byte is set.
-        data = '\x80'
-        parser = mux._MuxFramePayloadParser(data)
-        self.assertRaises(ValueError, parser._read_number)
-
-        # Using 3 bytes encoding for 125.
-        data = '\x7e\x00\x7d'
-        parser = mux._MuxFramePayloadParser(data)
-        self.assertRaises(ValueError, parser._read_number)
-
-        # Using 9 bytes encoding for 0xffff
-        data = '\x7f\x00\x00\x00\x00\x00\x00\xff\xff'
-        parser = mux._MuxFramePayloadParser(data)
-        self.assertRaises(ValueError, parser._read_number)
-
-    def test_read_invalid_size_and_contents(self):
-        # Only contain number field.
-        data = '\x01'
-        parser = mux._MuxFramePayloadParser(data)
-        self.assertRaises(mux.PhysicalConnectionError,
-                          parser._read_size_and_contents)
-
-    def test_create_add_channel_response(self):
-        data = mux._create_add_channel_response(channel_id=1,
-                                                encoded_handshake='FooBar',
-                                                encoding=0,
-                                                rejected=False)
-        self.assertEqual('\x20\x01\x06FooBar', data)
-
-        data = mux._create_add_channel_response(channel_id=2,
-                                                encoded_handshake='Hello',
-                                                encoding=1,
-                                                rejected=True)
-        self.assertEqual('\x31\x02\x05Hello', data)
-
-    def test_create_drop_channel(self):
-        data = mux._create_drop_channel(channel_id=1)
-        self.assertEqual('\x60\x01\x00', data)
-
-        data = mux._create_drop_channel(channel_id=1,
-                                        code=2000,
-                                        message='error')
-        self.assertEqual('\x60\x01\x07\x07\xd0error', data)
-
-        # reason must be empty if code is None
-        self.assertRaises(ValueError,
-                          mux._create_drop_channel,
-                          1, None, 'FooBar')
-
-    def test_parse_request_text(self):
-        request_text = _create_request_header()
-        command, path, version, headers = mux._parse_request_text(request_text)
-        self.assertEqual('GET', command)
-        self.assertEqual('/echo', path)
-        self.assertEqual('HTTP/1.1', version)
-        self.assertEqual(3, len(headers))
-        self.assertEqual('server.example.com', headers['Host'])
-        self.assertEqual('http://example.com', headers['Origin'])
-
-
-class MuxHandlerTest(unittest.TestCase):
-
-    def test_add_channel(self):
-        request = _create_mock_request()
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-        mux_handler.add_channel_slots(mux._INITIAL_NUMBER_OF_CHANNEL_SLOTS,
-                                      mux._INITIAL_QUOTA_FOR_CLIENT)
-
-        encoded_handshake = _create_request_header(path='/echo')
-        add_channel_request = _create_add_channel_request_frame(
-            channel_id=2, encoding=0,
-            encoded_handshake=encoded_handshake)
-        request.connection.put_bytes(add_channel_request)
-
-        flow_control = _create_flow_control_frame(channel_id=2,
-                                                  replenished_quota=6)
-        request.connection.put_bytes(flow_control)
-
-        encoded_handshake = _create_request_header(path='/echo')
-        add_channel_request = _create_add_channel_request_frame(
-            channel_id=3, encoding=0,
-            encoded_handshake=encoded_handshake)
-        request.connection.put_bytes(add_channel_request)
-
-        flow_control = _create_flow_control_frame(channel_id=3,
-                                                  replenished_quota=6)
-        request.connection.put_bytes(flow_control)
-
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=2, message='Hello'))
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=3, message='World'))
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=1, message='Goodbye'))
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=2, message='Goodbye'))
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=3, message='Goodbye'))
-
-        self.assertTrue(mux_handler.wait_until_done(timeout=2))
-
-        self.assertEqual([], dispatcher.channel_events[1].messages)
-        self.assertEqual(['Hello'], dispatcher.channel_events[2].messages)
-        self.assertEqual(['World'], dispatcher.channel_events[3].messages)
-        # Channel 2
-        messages = request.connection.get_written_messages(2)
-        self.assertEqual(1, len(messages))
-        self.assertEqual('Hello', messages[0])
-        # Channel 3
-        messages = request.connection.get_written_messages(3)
-        self.assertEqual(1, len(messages))
-        self.assertEqual('World', messages[0])
-        control_blocks = request.connection.get_written_control_blocks()
-        # There should be 8 control blocks:
-        #   - 1 NewChannelSlot
-        #   - 2 AddChannelResponses for channel id 2 and 3
-        #   - 6 FlowControls for channel id 1 (initialize), 'Hello', 'World',
-        #     and 3 'Goodbye's
-        self.assertEqual(9, len(control_blocks))
-
-    def test_physical_connection_write_failure(self):
-        # Use _FailOnWriteConnection.
-        request = _create_mock_request(connection=_FailOnWriteConnection())
-
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-
-        # Let the worker echo back 'Hello'. It causes _FailOnWriteConnection
-        # raising an exception.
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=1, message='Hello'))
-
-        # Let the worker exit. This will be unnecessary when
-        # _LogicalConnection.write() is changed to throw an exception if
-        # woke up by on_writer_done.
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=1, message='Goodbye'))
-
-        # All threads should be done.
-        self.assertTrue(mux_handler.wait_until_done(timeout=2))
-
-    def test_send_blocked(self):
-        request = _create_mock_request()
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-
-        mux_handler.add_channel_slots(mux._INITIAL_NUMBER_OF_CHANNEL_SLOTS,
-                                      mux._INITIAL_QUOTA_FOR_CLIENT)
-
-        encoded_handshake = _create_request_header(path='/echo')
-        add_channel_request = _create_add_channel_request_frame(
-            channel_id=2, encoding=0,
-            encoded_handshake=encoded_handshake)
-        request.connection.put_bytes(add_channel_request)
-
-        # On receiving this 'Hello', the server tries to echo back 'Hello',
-        # but it will be blocked since there's no send quota available for the
-        # channel 2.
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=2, message='Hello'))
-
-        # Wait until the worker is blocked due to send quota shortage.
-        time.sleep(1)
-
-        # Close the channel 2. The worker should be notified of the end of
-        # writer thread and stop waiting for send quota to be replenished.
-        drop_channel = _create_drop_channel_frame(channel_id=2)
-
-        request.connection.put_bytes(drop_channel)
-
-        # Make sure the channel 1 is also closed.
-        drop_channel = _create_drop_channel_frame(channel_id=1)
-        request.connection.put_bytes(drop_channel)
-
-        # All threads should be done.
-        self.assertTrue(mux_handler.wait_until_done(timeout=2))
-
-    def test_add_channel_delta_encoding(self):
-        request = _create_mock_request()
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-        mux_handler.add_channel_slots(mux._INITIAL_NUMBER_OF_CHANNEL_SLOTS,
-                                      mux._INITIAL_QUOTA_FOR_CLIENT)
-
-        delta = 'GET /echo HTTP/1.1\r\n\r\n'
-        add_channel_request = _create_add_channel_request_frame(
-            channel_id=2, encoding=1, encoded_handshake=delta)
-        request.connection.put_bytes(add_channel_request)
-
-        flow_control = _create_flow_control_frame(channel_id=2,
-                                                  replenished_quota=6)
-        request.connection.put_bytes(flow_control)
-
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=2, message='Hello'))
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=1, message='Goodbye'))
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=2, message='Goodbye'))
-
-        self.assertTrue(mux_handler.wait_until_done(timeout=2))
-
-        self.assertEqual(['Hello'], dispatcher.channel_events[2].messages)
-        messages = request.connection.get_written_messages(2)
-        self.assertEqual(1, len(messages))
-        self.assertEqual('Hello', messages[0])
-
-    def test_add_channel_delta_encoding_override(self):
-        request = _create_mock_request()
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-        mux_handler.add_channel_slots(mux._INITIAL_NUMBER_OF_CHANNEL_SLOTS,
-                                      mux._INITIAL_QUOTA_FOR_CLIENT)
-
-        # Override Sec-WebSocket-Protocol.
-        delta = ('GET /echo HTTP/1.1\r\n'
-                 'Sec-WebSocket-Protocol: x-foo\r\n'
-                 '\r\n')
-        add_channel_request = _create_add_channel_request_frame(
-            channel_id=2, encoding=1, encoded_handshake=delta)
-        request.connection.put_bytes(add_channel_request)
-
-        flow_control = _create_flow_control_frame(channel_id=2,
-                                                  replenished_quota=6)
-        request.connection.put_bytes(flow_control)
-
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=2, message='Hello'))
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=1, message='Goodbye'))
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=2, message='Goodbye'))
-
-        self.assertTrue(mux_handler.wait_until_done(timeout=2))
-
-        self.assertEqual(['Hello'], dispatcher.channel_events[2].messages)
-        messages = request.connection.get_written_messages(2)
-        self.assertEqual(1, len(messages))
-        self.assertEqual('Hello', messages[0])
-        self.assertEqual('x-foo',
-                         dispatcher.channel_events[2].request.ws_protocol)
-
-    def test_add_channel_delta_after_identity(self):
-        request = _create_mock_request()
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-        mux_handler.add_channel_slots(mux._INITIAL_NUMBER_OF_CHANNEL_SLOTS,
-                                      mux._INITIAL_QUOTA_FOR_CLIENT)
-        # Sec-WebSocket-Protocol is different from client's opening handshake
-        # of the physical connection.
-        # TODO(bashi): Remove Upgrade, Connection, Sec-WebSocket-Key and
-        # Sec-WebSocket-Version.
-        encoded_handshake = (
-            'GET /echo HTTP/1.1\r\n'
-            'Host: server.example.com\r\n'
-            'Sec-WebSocket-Protocol: x-foo\r\n'
-            'Connection: Upgrade\r\n'
-            'Origin: http://example.com\r\n'
-            '\r\n')
-        add_channel_request = _create_add_channel_request_frame(
-            channel_id=2, encoding=0,
-            encoded_handshake=encoded_handshake)
-        request.connection.put_bytes(add_channel_request)
-
-        flow_control = _create_flow_control_frame(channel_id=2,
-                                                  replenished_quota=6)
-        request.connection.put_bytes(flow_control)
-
-        delta = 'GET /echo HTTP/1.1\r\n\r\n'
-        add_channel_request = _create_add_channel_request_frame(
-            channel_id=3, encoding=1, encoded_handshake=delta)
-        request.connection.put_bytes(add_channel_request)
-
-        flow_control = _create_flow_control_frame(channel_id=3,
-                                                  replenished_quota=6)
-        request.connection.put_bytes(flow_control)
-
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=2, message='Hello'))
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=3, message='World'))
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=1, message='Goodbye'))
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=2, message='Goodbye'))
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=3, message='Goodbye'))
-
-        self.assertTrue(mux_handler.wait_until_done(timeout=2))
-
-        self.assertEqual([], dispatcher.channel_events[1].messages)
-        self.assertEqual(['Hello'], dispatcher.channel_events[2].messages)
-        self.assertEqual(['World'], dispatcher.channel_events[3].messages)
-        # Channel 2
-        messages = request.connection.get_written_messages(2)
-        self.assertEqual(1, len(messages))
-        self.assertEqual('Hello', messages[0])
-        # Channel 3
-        messages = request.connection.get_written_messages(3)
-        self.assertEqual(1, len(messages))
-        self.assertEqual('World', messages[0])
-        # Handshake base should be updated.
-        self.assertEqual(
-            'x-foo',
-            mux_handler._handshake_base._headers['Sec-WebSocket-Protocol'])
-
-    def test_add_channel_delta_remove_header(self):
-        request = _create_mock_request()
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-        mux_handler.add_channel_slots(mux._INITIAL_NUMBER_OF_CHANNEL_SLOTS,
-                                      mux._INITIAL_QUOTA_FOR_CLIENT)
-        # Override handshake delta base.
-        encoded_handshake = (
-            'GET /echo HTTP/1.1\r\n'
-            'Host: server.example.com\r\n'
-            'Sec-WebSocket-Protocol: x-foo\r\n'
-            'Connection: Upgrade\r\n'
-            'Origin: http://example.com\r\n'
-            '\r\n')
-        add_channel_request = _create_add_channel_request_frame(
-            channel_id=2, encoding=0,
-            encoded_handshake=encoded_handshake)
-        request.connection.put_bytes(add_channel_request)
-
-        flow_control = _create_flow_control_frame(channel_id=2,
-                                                  replenished_quota=6)
-        request.connection.put_bytes(flow_control)
-
-        # Remove Sec-WebSocket-Protocol header.
-        delta = ('GET /echo HTTP/1.1\r\n'
-                 'Sec-WebSocket-Protocol:'
-                 '\r\n')
-        add_channel_request = _create_add_channel_request_frame(
-            channel_id=3, encoding=1, encoded_handshake=delta)
-        request.connection.put_bytes(add_channel_request)
-
-        flow_control = _create_flow_control_frame(channel_id=3,
-                                                  replenished_quota=6)
-        request.connection.put_bytes(flow_control)
-
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=2, message='Hello'))
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=3, message='World'))
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=1, message='Goodbye'))
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=2, message='Goodbye'))
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=3, message='Goodbye'))
-
-        self.assertTrue(mux_handler.wait_until_done(timeout=2))
-
-        self.assertEqual([], dispatcher.channel_events[1].messages)
-        self.assertEqual(['Hello'], dispatcher.channel_events[2].messages)
-        self.assertEqual(['World'], dispatcher.channel_events[3].messages)
-        # Channel 2
-        messages = request.connection.get_written_messages(2)
-        self.assertEqual(1, len(messages))
-        self.assertEqual('Hello', messages[0])
-        # Channel 3
-        messages = request.connection.get_written_messages(3)
-        self.assertEqual(1, len(messages))
-        self.assertEqual('World', messages[0])
-        self.assertEqual(
-            'x-foo',
-            dispatcher.channel_events[2].request.ws_protocol)
-        self.assertEqual(
-            None,
-            dispatcher.channel_events[3].request.ws_protocol)
-
-    def test_add_channel_delta_encoding_permessage_deflate(self):
-        # Enable permessage deflate extension on the implicitly opened channel.
-        extensions = common.parse_extensions(
-            common.PERMESSAGE_DEFLATE_EXTENSION)
-        request = _create_mock_request(
-            logical_channel_extensions=extensions)
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-        mux_handler.add_channel_slots(mux._INITIAL_NUMBER_OF_CHANNEL_SLOTS,
-                                      mux._INITIAL_QUOTA_FOR_CLIENT)
-
-        delta = 'GET /echo HTTP/1.1\r\n\r\n'
-        add_channel_request = _create_add_channel_request_frame(
-            channel_id=2, encoding=1, encoded_handshake=delta)
-        request.connection.put_bytes(add_channel_request)
-
-        flow_control = _create_flow_control_frame(channel_id=2,
-                                                  replenished_quota=20)
-        request.connection.put_bytes(flow_control)
-
-        # Send compressed 'Hello' on logical channel 1 and 2.
-        compress = zlib.compressobj(
-            zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED, -zlib.MAX_WBITS)
-        compressed_hello = compress.compress('Hello')
-        compressed_hello += compress.flush(zlib.Z_SYNC_FLUSH)
-        compressed_hello = compressed_hello[:-4]
-
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=1, message=compressed_hello,
-                                  rsv1=True))
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=2, message=compressed_hello,
-                                  rsv1=True))
-
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=1, message='Goodbye'))
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=2, message='Goodbye'))
-
-        self.assertTrue(mux_handler.wait_until_done(timeout=2))
-
-        self.assertEqual(['Hello'], dispatcher.channel_events[1].messages)
-        self.assertEqual(['Hello'], dispatcher.channel_events[2].messages)
-        # Written 'Hello's should be compressed.
-        messages = request.connection.get_written_messages(1)
-        self.assertEqual(1, len(messages))
-        self.assertEqual(compressed_hello, messages[0])
-        messages = request.connection.get_written_messages(2)
-        self.assertEqual(1, len(messages))
-        self.assertEqual(compressed_hello, messages[0])
-
-    def test_add_channel_delta_encoding_remove_extensions(self):
-        # Enable permessage deflate extension on the implicitly opened channel.
-        extensions = common.parse_extensions(
-            common.PERMESSAGE_DEFLATE_EXTENSION)
-        request = _create_mock_request(
-            logical_channel_extensions=extensions)
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-        mux_handler.add_channel_slots(mux._INITIAL_NUMBER_OF_CHANNEL_SLOTS,
-                                      mux._INITIAL_QUOTA_FOR_CLIENT)
-
-        # Remove permessage deflate extension.
-        delta = ('GET /echo HTTP/1.1\r\n'
-                 'Sec-WebSocket-Extensions:\r\n'
-                 '\r\n')
-        add_channel_request = _create_add_channel_request_frame(
-            channel_id=2, encoding=1, encoded_handshake=delta)
-        request.connection.put_bytes(add_channel_request)
-
-        flow_control = _create_flow_control_frame(channel_id=2,
-                                                  replenished_quota=20)
-        request.connection.put_bytes(flow_control)
-
-        # Send compressed message on logical channel 2. The message should
-        # be rejected (since rsv1 is set).
-        compress = zlib.compressobj(
-            zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED, -zlib.MAX_WBITS)
-        compressed_hello = compress.compress('Hello')
-        compressed_hello += compress.flush(zlib.Z_SYNC_FLUSH)
-        compressed_hello = compressed_hello[:-4]
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=2, message=compressed_hello,
-                                  rsv1=True))
-
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=1, message='Goodbye'))
-
-        self.assertTrue(mux_handler.wait_until_done(timeout=2))
-
-        drop_channel = next(
-            b for b in request.connection.get_written_control_blocks()
-            if b.opcode == mux._MUX_OPCODE_DROP_CHANNEL)
-        self.assertEqual(mux._DROP_CODE_NORMAL_CLOSURE, drop_channel.drop_code)
-        self.assertEqual(2, drop_channel.channel_id)
-        # UnsupportedFrameException should be raised on logical channel 2.
-        self.assertTrue(isinstance(dispatcher.channel_events[2].exception,
-                                   UnsupportedFrameException))
-
-    def test_add_channel_invalid_encoding(self):
-        request = _create_mock_request()
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-        mux_handler.add_channel_slots(mux._INITIAL_NUMBER_OF_CHANNEL_SLOTS,
-                                      mux._INITIAL_QUOTA_FOR_CLIENT)
-
-        encoded_handshake = _create_request_header(path='/echo')
-        add_channel_request = _create_add_channel_request_frame(
-            channel_id=2, encoding=3,
-            encoded_handshake=encoded_handshake)
-        request.connection.put_bytes(add_channel_request)
-
-        self.assertTrue(mux_handler.wait_until_done(timeout=2))
-
-        drop_channel = next(
-            b for b in request.connection.get_written_control_blocks()
-            if b.opcode == mux._MUX_OPCODE_DROP_CHANNEL)
-        self.assertEqual(mux._DROP_CODE_UNKNOWN_REQUEST_ENCODING,
-                         drop_channel.drop_code)
-        self.assertEqual(common.STATUS_INTERNAL_ENDPOINT_ERROR,
-                         request.connection.server_close_code)
-
-    def test_add_channel_incomplete_handshake(self):
-        request = _create_mock_request()
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-        mux_handler.add_channel_slots(mux._INITIAL_NUMBER_OF_CHANNEL_SLOTS,
-                                      mux._INITIAL_QUOTA_FOR_CLIENT)
-
-        incomplete_encoded_handshake = 'GET /echo HTTP/1.1'
-        add_channel_request = _create_add_channel_request_frame(
-            channel_id=2, encoding=0,
-            encoded_handshake=incomplete_encoded_handshake)
-        request.connection.put_bytes(add_channel_request)
-
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=1, message='Goodbye'))
-
-        self.assertTrue(mux_handler.wait_until_done(timeout=2))
-
-        self.assertTrue(1 in dispatcher.channel_events)
-        self.assertTrue(not 2 in dispatcher.channel_events)
-
-    def test_add_channel_duplicate_channel_id(self):
-        request = _create_mock_request()
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-        mux_handler.add_channel_slots(mux._INITIAL_NUMBER_OF_CHANNEL_SLOTS,
-                                      mux._INITIAL_QUOTA_FOR_CLIENT)
-
-        encoded_handshake = _create_request_header(path='/echo')
-        add_channel_request = _create_add_channel_request_frame(
-            channel_id=2, encoding=0,
-            encoded_handshake=encoded_handshake)
-        request.connection.put_bytes(add_channel_request)
-
-        encoded_handshake = _create_request_header(path='/echo')
-        add_channel_request = _create_add_channel_request_frame(
-            channel_id=2, encoding=0,
-            encoded_handshake=encoded_handshake)
-        request.connection.put_bytes(add_channel_request)
-
-        self.assertTrue(mux_handler.wait_until_done(timeout=2))
-
-        drop_channel = next(
-            b for b in request.connection.get_written_control_blocks()
-            if b.opcode == mux._MUX_OPCODE_DROP_CHANNEL)
-        self.assertEqual(mux._DROP_CODE_CHANNEL_ALREADY_EXISTS,
-                         drop_channel.drop_code)
-        self.assertEqual(common.STATUS_INTERNAL_ENDPOINT_ERROR,
-                         request.connection.server_close_code)
-
-    def test_receive_drop_channel(self):
-        request = _create_mock_request()
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-        mux_handler.add_channel_slots(mux._INITIAL_NUMBER_OF_CHANNEL_SLOTS,
-                                      mux._INITIAL_QUOTA_FOR_CLIENT)
-
-        encoded_handshake = _create_request_header(path='/echo')
-        add_channel_request = _create_add_channel_request_frame(
-            channel_id=2, encoding=0,
-            encoded_handshake=encoded_handshake)
-        request.connection.put_bytes(add_channel_request)
-
-        drop_channel = _create_drop_channel_frame(channel_id=2)
-        request.connection.put_bytes(drop_channel)
-
-        # Terminate implicitly opened channel.
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=1, message='Goodbye'))
-
-        self.assertTrue(mux_handler.wait_until_done(timeout=2))
-
-        exception = dispatcher.channel_events[2].exception
-        self.assertTrue(exception.__class__ == ConnectionTerminatedException)
-
-    def test_receive_ping_frame(self):
-        request = _create_mock_request()
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-        mux_handler.add_channel_slots(mux._INITIAL_NUMBER_OF_CHANNEL_SLOTS,
-                                      mux._INITIAL_QUOTA_FOR_CLIENT)
-
-        encoded_handshake = _create_request_header(path='/echo')
-        add_channel_request = _create_add_channel_request_frame(
-            channel_id=2, encoding=0,
-            encoded_handshake=encoded_handshake)
-        request.connection.put_bytes(add_channel_request)
-
-        flow_control = _create_flow_control_frame(channel_id=2,
-                                                  replenished_quota=13)
-        request.connection.put_bytes(flow_control)
-
-        ping_frame = _create_logical_frame(channel_id=2,
-                                           message='Hello World!',
-                                           opcode=common.OPCODE_PING)
-        request.connection.put_bytes(ping_frame)
-
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=1, message='Goodbye'))
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=2, message='Goodbye'))
-
-        self.assertTrue(mux_handler.wait_until_done(timeout=2))
-
-        messages = request.connection.get_written_control_messages(2)
-        self.assertEqual(common.OPCODE_PONG, messages[0]['opcode'])
-        self.assertEqual('Hello World!', messages[0]['message'])
-
-    def test_receive_fragmented_ping(self):
-        request = _create_mock_request()
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-        mux_handler.add_channel_slots(mux._INITIAL_NUMBER_OF_CHANNEL_SLOTS,
-                                      mux._INITIAL_QUOTA_FOR_CLIENT)
-
-        encoded_handshake = _create_request_header(path='/echo')
-        add_channel_request = _create_add_channel_request_frame(
-            channel_id=2, encoding=0,
-            encoded_handshake=encoded_handshake)
-        request.connection.put_bytes(add_channel_request)
-
-        flow_control = _create_flow_control_frame(channel_id=2,
-                                                  replenished_quota=13)
-        request.connection.put_bytes(flow_control)
-
-        # Send a ping with message 'Hello world!' in two fragmented frames.
-        ping_frame1 = _create_logical_frame(channel_id=2,
-                                            message='Hello ',
-                                            fin=False,
-                                            opcode=common.OPCODE_PING)
-        request.connection.put_bytes(ping_frame1)
-        ping_frame2 = _create_logical_frame(channel_id=2,
-                                            message='World!',
-                                            fin=True,
-                                            opcode=common.OPCODE_CONTINUATION)
-        request.connection.put_bytes(ping_frame2)
-
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=1, message='Goodbye'))
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=2, message='Goodbye'))
-
-        self.assertTrue(mux_handler.wait_until_done(timeout=2))
-
-        messages = request.connection.get_written_control_messages(2)
-        self.assertEqual(common.OPCODE_PONG, messages[0]['opcode'])
-        self.assertEqual('Hello World!', messages[0]['message'])
-
-    def test_receive_fragmented_ping_while_receiving_fragmented_message(self):
-        request = _create_mock_request()
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-        mux_handler.add_channel_slots(mux._INITIAL_NUMBER_OF_CHANNEL_SLOTS,
-                                      mux._INITIAL_QUOTA_FOR_CLIENT)
-
-        encoded_handshake = _create_request_header(path='/echo')
-        add_channel_request = _create_add_channel_request_frame(
-            channel_id=2, encoding=0,
-            encoded_handshake=encoded_handshake)
-        request.connection.put_bytes(add_channel_request)
-
-        flow_control = _create_flow_control_frame(channel_id=2,
-                                                  replenished_quota=19)
-        request.connection.put_bytes(flow_control)
-
-        # Send a fragmented frame of message 'Hello '.
-        hello = _create_logical_frame(channel_id=2,
-                                      message='Hello ',
-                                      fin=False)
-        request.connection.put_bytes(hello)
-
-        # Before sending the last fragmented frame of the message, send a
-        # fragmented ping.
-        ping1 = _create_logical_frame(channel_id=2,
-                                      message='Pi',
-                                      fin=False,
-                                      opcode=common.OPCODE_PING)
-        request.connection.put_bytes(ping1)
-        ping2 = _create_logical_frame(channel_id=2,
-                                      message='ng!',
-                                      fin=True,
-                                      opcode=common.OPCODE_CONTINUATION)
-        request.connection.put_bytes(ping2)
-
-        # Send the last fragmented frame of the message.
-        world = _create_logical_frame(channel_id=2,
-                                      message='World!',
-                                      fin=True,
-                                      opcode=common.OPCODE_CONTINUATION)
-        request.connection.put_bytes(world)
-
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=1, message='Goodbye'))
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=2, message='Goodbye'))
-
-        self.assertTrue(mux_handler.wait_until_done(timeout=2))
-
-        messages = request.connection.get_written_messages(2)
-        self.assertEqual(['Hello World!'], messages)
-        control_messages = request.connection.get_written_control_messages(2)
-        self.assertEqual(common.OPCODE_PONG, control_messages[0]['opcode'])
-        self.assertEqual('Ping!', control_messages[0]['message'])
-
-    def test_receive_two_ping_while_receiving_fragmented_message(self):
-        request = _create_mock_request()
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-        mux_handler.add_channel_slots(mux._INITIAL_NUMBER_OF_CHANNEL_SLOTS,
-                                      mux._INITIAL_QUOTA_FOR_CLIENT)
-
-        encoded_handshake = _create_request_header(path='/echo')
-        add_channel_request = _create_add_channel_request_frame(
-            channel_id=2, encoding=0,
-            encoded_handshake=encoded_handshake)
-        request.connection.put_bytes(add_channel_request)
-
-        flow_control = _create_flow_control_frame(channel_id=2,
-                                                  replenished_quota=25)
-        request.connection.put_bytes(flow_control)
-
-        # Send a fragmented frame of message 'Hello '.
-        hello = _create_logical_frame(channel_id=2,
-                                      message='Hello ',
-                                      fin=False)
-        request.connection.put_bytes(hello)
-
-        # Before sending the last fragmented frame of the message, send a
-        # fragmented ping and a non-fragmented ping.
-        ping1 = _create_logical_frame(channel_id=2,
-                                      message='Pi',
-                                      fin=False,
-                                      opcode=common.OPCODE_PING)
-        request.connection.put_bytes(ping1)
-        ping2 = _create_logical_frame(channel_id=2,
-                                      message='ng!',
-                                      fin=True,
-                                      opcode=common.OPCODE_CONTINUATION)
-        request.connection.put_bytes(ping2)
-        ping3 = _create_logical_frame(channel_id=2,
-                                      message='Pong!',
-                                      fin=True,
-                                      opcode=common.OPCODE_PING)
-        request.connection.put_bytes(ping3)
-
-        # Send the last fragmented frame of the message.
-        world = _create_logical_frame(channel_id=2,
-                                      message='World!',
-                                      fin=True,
-                                      opcode=common.OPCODE_CONTINUATION)
-        request.connection.put_bytes(world)
-
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=1, message='Goodbye'))
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=2, message='Goodbye'))
-
-        self.assertTrue(mux_handler.wait_until_done(timeout=2))
-
-        messages = request.connection.get_written_messages(2)
-        self.assertEqual(['Hello World!'], messages)
-        control_messages = request.connection.get_written_control_messages(2)
-        self.assertEqual(common.OPCODE_PONG, control_messages[0]['opcode'])
-        self.assertEqual('Ping!', control_messages[0]['message'])
-        self.assertEqual(common.OPCODE_PONG, control_messages[1]['opcode'])
-        self.assertEqual('Pong!', control_messages[1]['message'])
-
-    def test_receive_message_while_receiving_fragmented_ping(self):
-        request = _create_mock_request()
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-        mux_handler.add_channel_slots(mux._INITIAL_NUMBER_OF_CHANNEL_SLOTS,
-                                      mux._INITIAL_QUOTA_FOR_CLIENT)
-
-        encoded_handshake = _create_request_header(path='/echo')
-        add_channel_request = _create_add_channel_request_frame(
-            channel_id=2, encoding=0,
-            encoded_handshake=encoded_handshake)
-        request.connection.put_bytes(add_channel_request)
-
-        flow_control = _create_flow_control_frame(channel_id=2,
-                                                replenished_quota=19)
-        request.connection.put_bytes(flow_control)
-
-        # Send a fragmented ping.
-        ping1 = _create_logical_frame(channel_id=2,
-                                      message='Pi',
-                                      fin=False,
-                                      opcode=common.OPCODE_PING)
-        request.connection.put_bytes(ping1)
-
-        # Before sending the last fragmented ping, send a message.
-        # The logical channel (2) should be dropped.
-        message = _create_logical_frame(channel_id=2,
-                                        message='Hello world!',
-                                        fin=True)
-        request.connection.put_bytes(message)
-
-        # Send the last fragmented frame of the message.
-        ping2 = _create_logical_frame(channel_id=2,
-                                      message='ng!',
-                                      fin=True,
-                                      opcode=common.OPCODE_CONTINUATION)
-        request.connection.put_bytes(ping2)
-
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=1, message='Goodbye'))
-
-        self.assertTrue(mux_handler.wait_until_done(timeout=2))
-
-        drop_channel = next(
-            b for b in request.connection.get_written_control_blocks()
-            if b.opcode == mux._MUX_OPCODE_DROP_CHANNEL)
-        self.assertEqual(2, drop_channel.channel_id)
-        # No message should be sent on channel 2.
-        self.assertRaises(KeyError,
-                          request.connection.get_written_messages,
-                          2)
-        self.assertRaises(KeyError,
-                          request.connection.get_written_control_messages,
-                          2)
-
-    def test_send_ping(self):
-        request = _create_mock_request()
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-        mux_handler.add_channel_slots(mux._INITIAL_NUMBER_OF_CHANNEL_SLOTS,
-                                      mux._INITIAL_QUOTA_FOR_CLIENT)
-
-        encoded_handshake = _create_request_header(path='/ping')
-        add_channel_request = _create_add_channel_request_frame(
-            channel_id=2, encoding=0,
-            encoded_handshake=encoded_handshake)
-        request.connection.put_bytes(add_channel_request)
-
-        flow_control = _create_flow_control_frame(channel_id=2,
-                                                  replenished_quota=6)
-        request.connection.put_bytes(flow_control)
-
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=1, message='Goodbye'))
-
-        self.assertTrue(mux_handler.wait_until_done(timeout=2))
-
-        messages = request.connection.get_written_control_messages(2)
-        self.assertEqual(common.OPCODE_PING, messages[0]['opcode'])
-        self.assertEqual('Ping!', messages[0]['message'])
-
-    def test_send_fragmented_ping(self):
-        request = _create_mock_request()
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-        mux_handler.add_channel_slots(mux._INITIAL_NUMBER_OF_CHANNEL_SLOTS,
-                                      mux._INITIAL_QUOTA_FOR_CLIENT)
-
-        encoded_handshake = _create_request_header(path='/ping')
-        add_channel_request = _create_add_channel_request_frame(
-            channel_id=2, encoding=0,
-            encoded_handshake=encoded_handshake)
-        request.connection.put_bytes(add_channel_request)
-
-        # Replenish 3 bytes. This isn't enough to send the whole ping frame
-        # because the frame will have 5 bytes message('Ping!'). The frame
-        # should be fragmented.
-        flow_control = _create_flow_control_frame(channel_id=2,
-                                                  replenished_quota=3)
-        request.connection.put_bytes(flow_control)
-
-        # Wait until the worker is blocked due to send quota shortage.
-        time.sleep(1)
-
-        # Replenish remaining 2 + 1 bytes (including extra cost).
-        flow_control = _create_flow_control_frame(channel_id=2,
-                                                  replenished_quota=3)
-        request.connection.put_bytes(flow_control)
-
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=1, message='Goodbye'))
-
-        self.assertTrue(mux_handler.wait_until_done(timeout=2))
-
-        messages = request.connection.get_written_control_messages(2)
-        self.assertEqual(common.OPCODE_PING, messages[0]['opcode'])
-        self.assertEqual('Ping!', messages[0]['message'])
-
-    def test_send_fragmented_ping_while_sending_fragmented_message(self):
-        request = _create_mock_request()
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-        mux_handler.add_channel_slots(mux._INITIAL_NUMBER_OF_CHANNEL_SLOTS,
-                                      mux._INITIAL_QUOTA_FOR_CLIENT)
-
-        encoded_handshake = _create_request_header(
-            path='/ping_while_hello_world')
-        add_channel_request = _create_add_channel_request_frame(
-            channel_id=2, encoding=0,
-            encoded_handshake=encoded_handshake)
-        request.connection.put_bytes(add_channel_request)
-
-        # Application will send:
-        # - text message 'Hello ' with fin=0
-        # - ping with 'Ping!' message
-        # - text message 'World!' with fin=1
-        # Replenish (6 + 1) + (2 + 1) bytes so that the ping will be
-        # fragmented on the logical channel.
-        flow_control = _create_flow_control_frame(channel_id=2,
-                                                  replenished_quota=10)
-        request.connection.put_bytes(flow_control)
-
-        time.sleep(1)
-
-        # Replenish remaining 3 + 6 bytes.
-        flow_control = _create_flow_control_frame(channel_id=2,
-                                                  replenished_quota=9)
-        request.connection.put_bytes(flow_control)
-
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=1, message='Goodbye'))
-
-        self.assertTrue(mux_handler.wait_until_done(timeout=2))
-
-        messages = request.connection.get_written_messages(2)
-        self.assertEqual(['Hello World!'], messages)
-        control_messages = request.connection.get_written_control_messages(2)
-        self.assertEqual(common.OPCODE_PING, control_messages[0]['opcode'])
-        self.assertEqual('Ping!', control_messages[0]['message'])
-
-    def test_send_fragmented_two_ping_while_sending_fragmented_message(self):
-        request = _create_mock_request()
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-        mux_handler.add_channel_slots(mux._INITIAL_NUMBER_OF_CHANNEL_SLOTS,
-                                      mux._INITIAL_QUOTA_FOR_CLIENT)
-
-        encoded_handshake = _create_request_header(
-            path='/two_ping_while_hello_world')
-        add_channel_request = _create_add_channel_request_frame(
-            channel_id=2, encoding=0,
-            encoded_handshake=encoded_handshake)
-        request.connection.put_bytes(add_channel_request)
-
-        # Application will send:
-        # - text message 'Hello ' with fin=0
-        # - ping with 'Ping!' message
-        # - ping with 'Pong!' message
-        # - text message 'World!' with fin=1
-        # Replenish (6 + 1) + (2 + 1) bytes so that the first ping will be
-        # fragmented on the logical channel.
-        flow_control = _create_flow_control_frame(channel_id=2,
-                                                  replenished_quota=10)
-        request.connection.put_bytes(flow_control)
-
-        time.sleep(1)
-
-        # Replenish remaining 3 + (5 + 1) + 6 bytes. The second ping won't
-        # be fragmented on the logical channel.
-        flow_control = _create_flow_control_frame(channel_id=2,
-                                                  replenished_quota=15)
-        request.connection.put_bytes(flow_control)
-
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=1, message='Goodbye'))
-
-        self.assertTrue(mux_handler.wait_until_done(timeout=2))
-
-        messages = request.connection.get_written_messages(2)
-        self.assertEqual(['Hello World!'], messages)
-        control_messages = request.connection.get_written_control_messages(2)
-        self.assertEqual(common.OPCODE_PING, control_messages[0]['opcode'])
-        self.assertEqual('Ping!', control_messages[0]['message'])
-        self.assertEqual(common.OPCODE_PING, control_messages[1]['opcode'])
-        self.assertEqual('Pong!', control_messages[1]['message'])
-
-    def test_send_drop_channel(self):
-        request = _create_mock_request()
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-
-        # DropChannel for channel id 1 which doesn't have reason.
-        frame = create_binary_frame('\x00\x60\x01\x00', mask=True)
-        request.connection.put_bytes(frame)
-
-        self.assertTrue(mux_handler.wait_until_done(timeout=2))
-
-        drop_channel = next(
-            b for b in request.connection.get_written_control_blocks()
-            if b.opcode == mux._MUX_OPCODE_DROP_CHANNEL)
-        self.assertEqual(mux._DROP_CODE_ACKNOWLEDGED,
-                         drop_channel.drop_code)
-        self.assertEqual(1, drop_channel.channel_id)
-
-    def test_two_flow_control(self):
-        request = _create_mock_request()
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-        mux_handler.add_channel_slots(mux._INITIAL_NUMBER_OF_CHANNEL_SLOTS,
-                                      mux._INITIAL_QUOTA_FOR_CLIENT)
-
-        encoded_handshake = _create_request_header(path='/echo')
-        add_channel_request = _create_add_channel_request_frame(
-            channel_id=2, encoding=0,
-            encoded_handshake=encoded_handshake)
-        request.connection.put_bytes(add_channel_request)
-
-        # Replenish 5 bytes.
-        flow_control = _create_flow_control_frame(channel_id=2,
-                                                  replenished_quota=5)
-        request.connection.put_bytes(flow_control)
-
-        # Send 10 bytes. The server will try echo back 10 bytes.
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=2, message='HelloWorld'))
-
-        # Replenish 5 + 1 (per-message extra cost) bytes.
-        flow_control = _create_flow_control_frame(channel_id=2,
-                                                  replenished_quota=6)
-        request.connection.put_bytes(flow_control)
-
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=1, message='Goodbye'))
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=2, message='Goodbye'))
-
-        self.assertTrue(mux_handler.wait_until_done(timeout=2))
-
-        messages = request.connection.get_written_messages(2)
-        self.assertEqual(['HelloWorld'], messages)
-        received_flow_controls = [
-            b for b in request.connection.get_written_control_blocks()
-            if b.opcode == mux._MUX_OPCODE_FLOW_CONTROL and b.channel_id == 2]
-        # Replenishment for 'HelloWorld' + 1
-        self.assertEqual(11, received_flow_controls[0].send_quota)
-        # Replenishment for 'Goodbye' + 1
-        self.assertEqual(8, received_flow_controls[1].send_quota)
-
-    def test_no_send_quota_on_server(self):
-        request = _create_mock_request()
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-        mux_handler.add_channel_slots(mux._INITIAL_NUMBER_OF_CHANNEL_SLOTS,
-                                      mux._INITIAL_QUOTA_FOR_CLIENT)
-
-        encoded_handshake = _create_request_header(path='/echo')
-        add_channel_request = _create_add_channel_request_frame(
-            channel_id=2, encoding=0,
-            encoded_handshake=encoded_handshake)
-        request.connection.put_bytes(add_channel_request)
-
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=2, message='HelloWorld'))
-
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=1, message='Goodbye'))
-
-        # Just wait for 1 sec so that the server attempts to echo back
-        # 'HelloWorld'.
-        self.assertFalse(mux_handler.wait_until_done(timeout=1))
-
-        # No message should be sent on channel 2.
-        self.assertRaises(KeyError,
-                          request.connection.get_written_messages,
-                          2)
-
-    def test_no_send_quota_on_server_for_permessage_extra_cost(self):
-        request = _create_mock_request()
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-        mux_handler.add_channel_slots(mux._INITIAL_NUMBER_OF_CHANNEL_SLOTS,
-                                      mux._INITIAL_QUOTA_FOR_CLIENT)
-
-        encoded_handshake = _create_request_header(path='/echo')
-        add_channel_request = _create_add_channel_request_frame(
-            channel_id=2, encoding=0,
-            encoded_handshake=encoded_handshake)
-        request.connection.put_bytes(add_channel_request)
-
-        flow_control = _create_flow_control_frame(channel_id=2,
-                                                  replenished_quota=6)
-        request.connection.put_bytes(flow_control)
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=2, message='Hello'))
-        # Replenish only len('World') bytes.
-        flow_control = _create_flow_control_frame(channel_id=2,
-                                                  replenished_quota=5)
-        request.connection.put_bytes(flow_control)
-        # Server should not callback for this message.
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=2, message='World'))
-
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=1, message='Goodbye'))
-
-        # Just wait for 1 sec so that the server attempts to echo back
-        # 'World'.
-        self.assertFalse(mux_handler.wait_until_done(timeout=1))
-
-        # Only one message should be sent on channel 2.
-        messages = request.connection.get_written_messages(2)
-        self.assertEqual(['Hello'], messages)
-
-    def test_quota_violation_by_client(self):
-        request = _create_mock_request()
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-        mux_handler.add_channel_slots(mux._INITIAL_NUMBER_OF_CHANNEL_SLOTS, 0)
-
-        encoded_handshake = _create_request_header(path='/echo')
-        add_channel_request = _create_add_channel_request_frame(
-            channel_id=2, encoding=0,
-            encoded_handshake=encoded_handshake)
-        request.connection.put_bytes(add_channel_request)
-
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=2, message='HelloWorld'))
-
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=1, message='Goodbye'))
-
-        self.assertTrue(mux_handler.wait_until_done(timeout=2))
-
-        control_blocks = request.connection.get_written_control_blocks()
-        self.assertEqual(5, len(control_blocks))
-        drop_channel = next(
-            b for b in control_blocks
-            if b.opcode == mux._MUX_OPCODE_DROP_CHANNEL)
-        self.assertEqual(mux._DROP_CODE_SEND_QUOTA_VIOLATION,
-                         drop_channel.drop_code)
-
-    def test_consume_quota_empty_message(self):
-        request = _create_mock_request()
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-        # Client has 1 byte quota.
-        mux_handler.add_channel_slots(mux._INITIAL_NUMBER_OF_CHANNEL_SLOTS, 1)
-
-        encoded_handshake = _create_request_header(path='/echo')
-        add_channel_request = _create_add_channel_request_frame(
-            channel_id=2, encoding=0,
-            encoded_handshake=encoded_handshake)
-        request.connection.put_bytes(add_channel_request)
-
-        flow_control = _create_flow_control_frame(channel_id=2,
-                                                  replenished_quota=2)
-        request.connection.put_bytes(flow_control)
-        # Send an empty message. Pywebsocket always replenishes 1 byte quota
-        # for empty message
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=2, message=''))
-
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=1, message='Goodbye'))
-        # This message violates quota on channel id 2.
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=2, message='Goodbye'))
-
-        self.assertTrue(mux_handler.wait_until_done(timeout=2))
-
-        self.assertEqual(1, len(dispatcher.channel_events[2].messages))
-        self.assertEqual('', dispatcher.channel_events[2].messages[0])
-
-        received_flow_controls = [
-            b for b in request.connection.get_written_control_blocks()
-            if b.opcode == mux._MUX_OPCODE_FLOW_CONTROL and b.channel_id == 2]
-        self.assertEqual(1, len(received_flow_controls))
-        self.assertEqual(1, received_flow_controls[0].send_quota)
-
-        drop_channel = next(
-            b for b in request.connection.get_written_control_blocks()
-            if b.opcode == mux._MUX_OPCODE_DROP_CHANNEL)
-        self.assertEqual(2, drop_channel.channel_id)
-        self.assertEqual(mux._DROP_CODE_SEND_QUOTA_VIOLATION,
-                         drop_channel.drop_code)
-
-    def test_consume_quota_fragmented_message(self):
-        request = _create_mock_request()
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-        # Client has len('Hello') + len('Goodbye') + 2 bytes quota.
-        mux_handler.add_channel_slots(mux._INITIAL_NUMBER_OF_CHANNEL_SLOTS, 14)
-
-        encoded_handshake = _create_request_header(path='/echo')
-        add_channel_request = _create_add_channel_request_frame(
-            channel_id=2, encoding=0,
-            encoded_handshake=encoded_handshake)
-        request.connection.put_bytes(add_channel_request)
-
-        flow_control = _create_flow_control_frame(channel_id=2,
-                                                  replenished_quota=6)
-        request.connection.put_bytes(flow_control)
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=2, message='He', fin=False,
-                                  opcode=common.OPCODE_TEXT))
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=2, message='llo', fin=True,
-                                  opcode=common.OPCODE_CONTINUATION))
-
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=1, message='Goodbye'))
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=2, message='Goodbye'))
-
-        self.assertTrue(mux_handler.wait_until_done(timeout=2))
-
-        messages = request.connection.get_written_messages(2)
-        self.assertEqual(['Hello'], messages)
-
-    def test_fragmented_control_message(self):
-        request = _create_mock_request()
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-        mux_handler.add_channel_slots(mux._INITIAL_NUMBER_OF_CHANNEL_SLOTS,
-                                      mux._INITIAL_QUOTA_FOR_CLIENT)
-
-        encoded_handshake = _create_request_header(path='/ping')
-        add_channel_request = _create_add_channel_request_frame(
-            channel_id=2, encoding=0,
-            encoded_handshake=encoded_handshake)
-        request.connection.put_bytes(add_channel_request)
-
-        # Replenish total 6 bytes in 3 FlowControls.
-        flow_control = _create_flow_control_frame(channel_id=2,
-                                                  replenished_quota=1)
-        request.connection.put_bytes(flow_control)
-
-        flow_control = _create_flow_control_frame(channel_id=2,
-                                                  replenished_quota=2)
-        request.connection.put_bytes(flow_control)
-
-        flow_control = _create_flow_control_frame(channel_id=2,
-                                                  replenished_quota=3)
-        request.connection.put_bytes(flow_control)
-
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=1, message='Goodbye'))
-
-        self.assertTrue(mux_handler.wait_until_done(timeout=2))
-
-        messages = request.connection.get_written_control_messages(2)
-        self.assertEqual(common.OPCODE_PING, messages[0]['opcode'])
-        self.assertEqual('Ping!', messages[0]['message'])
-
-    def test_channel_slot_violation_by_client(self):
-        request = _create_mock_request()
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-        mux_handler.add_channel_slots(slots=1,
-                                      send_quota=mux._INITIAL_QUOTA_FOR_CLIENT)
-
-        encoded_handshake = _create_request_header(path='/echo')
-        add_channel_request = _create_add_channel_request_frame(
-            channel_id=2, encoding=0,
-            encoded_handshake=encoded_handshake)
-        request.connection.put_bytes(add_channel_request)
-        flow_control = _create_flow_control_frame(channel_id=2,
-                                                  replenished_quota=6)
-        request.connection.put_bytes(flow_control)
-
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=2, message='Hello'))
-
-        # This request should be rejected.
-        encoded_handshake = _create_request_header(path='/echo')
-        add_channel_request = _create_add_channel_request_frame(
-            channel_id=3, encoding=0,
-            encoded_handshake=encoded_handshake)
-        request.connection.put_bytes(add_channel_request)
-        flow_control = _create_flow_control_frame(channel_id=3,
-                                                  replenished_quota=6)
-        request.connection.put_bytes(flow_control)
-
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=3, message='Hello'))
-
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=1, message='Goodbye'))
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=2, message='Goodbye'))
-
-        self.assertTrue(mux_handler.wait_until_done(timeout=2))
-
-        self.assertEqual([], dispatcher.channel_events[1].messages)
-        self.assertEqual(['Hello'], dispatcher.channel_events[2].messages)
-        self.assertFalse(dispatcher.channel_events.has_key(3))
-        drop_channel = next(
-            b for b in request.connection.get_written_control_blocks()
-            if b.opcode == mux._MUX_OPCODE_DROP_CHANNEL)
-        self.assertEqual(3, drop_channel.channel_id)
-        self.assertEqual(mux._DROP_CODE_NEW_CHANNEL_SLOT_VIOLATION,
-                         drop_channel.drop_code)
-
-    def test_quota_overflow_by_client(self):
-        request = _create_mock_request()
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-        mux_handler.add_channel_slots(slots=1,
-                                      send_quota=mux._INITIAL_QUOTA_FOR_CLIENT)
-
-        encoded_handshake = _create_request_header(path='/echo')
-        add_channel_request = _create_add_channel_request_frame(
-            channel_id=2, encoding=0,
-            encoded_handshake=encoded_handshake)
-        request.connection.put_bytes(add_channel_request)
-        # Replenish 0x7FFFFFFFFFFFFFFF bytes twice.
-        flow_control = _create_flow_control_frame(
-            channel_id=2,
-            replenished_quota=0x7FFFFFFFFFFFFFFF)
-        request.connection.put_bytes(flow_control)
-        request.connection.put_bytes(flow_control)
-
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=1, message='Goodbye'))
-
-        self.assertTrue(mux_handler.wait_until_done(timeout=2))
-
-        drop_channel = next(
-            b for b in request.connection.get_written_control_blocks()
-            if b.opcode == mux._MUX_OPCODE_DROP_CHANNEL)
-        self.assertEqual(2, drop_channel.channel_id)
-        self.assertEqual(mux._DROP_CODE_SEND_QUOTA_OVERFLOW,
-                         drop_channel.drop_code)
-
-    def test_invalid_encapsulated_message(self):
-        request = _create_mock_request()
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-
-        first_byte = (mux._MUX_OPCODE_ADD_CHANNEL_REQUEST << 5)
-        block = (chr(first_byte) +
-                 mux._encode_channel_id(1) +
-                 mux._encode_number(0))
-        payload = mux._encode_channel_id(mux._CONTROL_CHANNEL_ID) + block
-        text_frame = create_binary_frame(payload, opcode=common.OPCODE_TEXT,
-                                         mask=True)
-        request.connection.put_bytes(text_frame)
-
-        self.assertTrue(mux_handler.wait_until_done(timeout=2))
-
-        drop_channel = next(
-            b for b in request.connection.get_written_control_blocks()
-            if b.opcode == mux._MUX_OPCODE_DROP_CHANNEL)
-        self.assertEqual(mux._DROP_CODE_INVALID_ENCAPSULATING_MESSAGE,
-                         drop_channel.drop_code)
-        self.assertEqual(common.STATUS_INTERNAL_ENDPOINT_ERROR,
-                         request.connection.server_close_code)
-
-    def test_channel_id_truncated(self):
-        request = _create_mock_request()
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-
-        # The last byte of the channel id is missing.
-        frame = create_binary_frame('\x80', mask=True)
-        request.connection.put_bytes(frame)
-
-        self.assertTrue(mux_handler.wait_until_done(timeout=2))
-
-        drop_channel = next(
-            b for b in request.connection.get_written_control_blocks()
-            if b.opcode == mux._MUX_OPCODE_DROP_CHANNEL)
-        self.assertEqual(mux._DROP_CODE_CHANNEL_ID_TRUNCATED,
-                         drop_channel.drop_code)
-        self.assertEqual(common.STATUS_INTERNAL_ENDPOINT_ERROR,
-                         request.connection.server_close_code)
-
-    def test_inner_frame_truncated(self):
-        request = _create_mock_request()
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-
-        # Just contain channel id 1.
-        frame = create_binary_frame('\x01', mask=True)
-        request.connection.put_bytes(frame)
-
-        self.assertTrue(mux_handler.wait_until_done(timeout=2))
-
-        drop_channel = next(
-            b for b in request.connection.get_written_control_blocks()
-            if b.opcode == mux._MUX_OPCODE_DROP_CHANNEL)
-        self.assertEqual(mux._DROP_CODE_ENCAPSULATED_FRAME_IS_TRUNCATED,
-                         drop_channel.drop_code)
-        self.assertEqual(common.STATUS_INTERNAL_ENDPOINT_ERROR,
-                         request.connection.server_close_code)
-
-    def test_unknown_mux_opcode(self):
-        request = _create_mock_request()
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-
-        # Undefined opcode 5
-        frame = create_binary_frame('\x00\xa0', mask=True)
-        request.connection.put_bytes(frame)
-
-        self.assertTrue(mux_handler.wait_until_done(timeout=2))
-
-        drop_channel = next(
-            b for b in request.connection.get_written_control_blocks()
-            if b.opcode == mux._MUX_OPCODE_DROP_CHANNEL)
-        self.assertEqual(mux._DROP_CODE_UNKNOWN_MUX_OPCODE,
-                         drop_channel.drop_code)
-        self.assertEqual(common.STATUS_INTERNAL_ENDPOINT_ERROR,
-                         request.connection.server_close_code)
-
-    def test_invalid_mux_control_block(self):
-        request = _create_mock_request()
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-
-        # DropChannel contains 1 byte reason
-        frame = create_binary_frame('\x00\x60\x00\x01\x00', mask=True)
-        request.connection.put_bytes(frame)
-
-        self.assertTrue(mux_handler.wait_until_done(timeout=2))
-
-        drop_channel = next(
-            b for b in request.connection.get_written_control_blocks()
-            if b.opcode == mux._MUX_OPCODE_DROP_CHANNEL)
-        self.assertEqual(mux._DROP_CODE_INVALID_MUX_CONTROL_BLOCK,
-                         drop_channel.drop_code)
-        self.assertEqual(common.STATUS_INTERNAL_ENDPOINT_ERROR,
-                         request.connection.server_close_code)
-
-    def test_permessage_deflate(self):
-        request = _create_mock_request()
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-        mux_handler.add_channel_slots(mux._INITIAL_NUMBER_OF_CHANNEL_SLOTS,
-                                      mux._INITIAL_QUOTA_FOR_CLIENT)
-
-        # Enable permessage deflate extension on logical channel 2.
-        extensions = common.PERMESSAGE_DEFLATE_EXTENSION
-        encoded_handshake = _create_request_header(path='/echo',
-                                                   extensions=extensions)
-        add_channel_request = _create_add_channel_request_frame(
-            channel_id=2, encoding=0,
-            encoded_handshake=encoded_handshake)
-        request.connection.put_bytes(add_channel_request)
-
-        flow_control = _create_flow_control_frame(channel_id=2,
-                                                  replenished_quota=20)
-        request.connection.put_bytes(flow_control)
-
-        # Send compressed 'Hello' twice.
-        compress = zlib.compressobj(
-            zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED, -zlib.MAX_WBITS)
-        compressed_hello1 = compress.compress('Hello')
-        compressed_hello1 += compress.flush(zlib.Z_SYNC_FLUSH)
-        compressed_hello1 = compressed_hello1[:-4]
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=2, message=compressed_hello1,
-                                  rsv1=True))
-        compressed_hello2 = compress.compress('Hello')
-        compressed_hello2 += compress.flush(zlib.Z_SYNC_FLUSH)
-        compressed_hello2 = compressed_hello2[:-4]
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=2, message=compressed_hello2,
-                                  rsv1=True))
-
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=1, message='Goodbye'))
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=2, message='Goodbye'))
-
-        self.assertTrue(mux_handler.wait_until_done(timeout=2))
-
-        self.assertEqual(['Hello', 'Hello'],
-                         dispatcher.channel_events[2].messages)
-        # Written 'Hello's should be compressed.
-        messages = request.connection.get_written_messages(2)
-        self.assertEqual(2, len(messages))
-        self.assertEqual(compressed_hello1, messages[0])
-        self.assertEqual(compressed_hello2, messages[1])
-
-
-    def test_permessage_deflate_fragmented_message(self):
-        extensions = common.parse_extensions(
-            common.PERMESSAGE_DEFLATE_EXTENSION)
-        request = _create_mock_request(
-            logical_channel_extensions=extensions)
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-        mux_handler.add_channel_slots(mux._INITIAL_NUMBER_OF_CHANNEL_SLOTS,
-                                      mux._INITIAL_QUOTA_FOR_CLIENT)
-
-        # Send compressed 'HelloHelloHello' as fragmented message.
-        compress = zlib.compressobj(
-            zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED, -zlib.MAX_WBITS)
-        compressed_hello = compress.compress('HelloHelloHello')
-        compressed_hello += compress.flush(zlib.Z_SYNC_FLUSH)
-        compressed_hello = compressed_hello[:-4]
-
-        m = len(compressed_hello) / 2
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=1,
-                                  message=compressed_hello[:m],
-                                  fin=False, rsv1=True,
-                                  opcode=common.OPCODE_TEXT))
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=1,
-                                  message=compressed_hello[m:],
-                                  fin=True, rsv1=False,
-                                  opcode=common.OPCODE_CONTINUATION))
-
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=1, message='Goodbye'))
-
-        self.assertTrue(mux_handler.wait_until_done(timeout=2))
-
-        self.assertEqual(['HelloHelloHello'],
-                         dispatcher.channel_events[1].messages)
-        messages = request.connection.get_written_messages(1)
-        self.assertEqual(1, len(messages))
-        self.assertEqual(compressed_hello, messages[0])
-
-    def test_receive_bad_fragmented_message(self):
-        request = _create_mock_request()
-        dispatcher = _MuxMockDispatcher()
-        mux_handler = mux._MuxHandler(request, dispatcher)
-        mux_handler.start()
-        mux_handler.add_channel_slots(mux._INITIAL_NUMBER_OF_CHANNEL_SLOTS,
-                                      mux._INITIAL_QUOTA_FOR_CLIENT)
-
-        encoded_handshake = _create_request_header(path='/echo')
-        add_channel_request = _create_add_channel_request_frame(
-            channel_id=2, encoding=0,
-            encoded_handshake=encoded_handshake)
-        request.connection.put_bytes(add_channel_request)
-
-        # Send a frame with fin=False, and then send a frame with
-        # opcode=TEXT (not CONTINUATION). Logical channel 2 should be dropped.
-        frame1 = _create_logical_frame(channel_id=2,
-                                       message='Hello ',
-                                       fin=False,
-                                       opcode=common.OPCODE_TEXT)
-        request.connection.put_bytes(frame1)
-        frame2 = _create_logical_frame(channel_id=2,
-                                       message='World!',
-                                       fin=True,
-                                       opcode=common.OPCODE_TEXT)
-        request.connection.put_bytes(frame2)
-
-        encoded_handshake = _create_request_header(path='/echo')
-        add_channel_request = _create_add_channel_request_frame(
-            channel_id=3, encoding=0,
-            encoded_handshake=encoded_handshake)
-        request.connection.put_bytes(add_channel_request)
-
-        # Send a frame with opcode=CONTINUATION without a preceding frame
-        # the fin of which is not set. Logical channel 3 should be dropped.
-        frame3 = _create_logical_frame(channel_id=3,
-                                       message='Hello',
-                                       fin=True,
-                                       opcode=common.OPCODE_CONTINUATION)
-        request.connection.put_bytes(frame3)
-
-        encoded_handshake = _create_request_header(path='/echo')
-        add_channel_request = _create_add_channel_request_frame(
-            channel_id=4, encoding=0,
-            encoded_handshake=encoded_handshake)
-        request.connection.put_bytes(add_channel_request)
-
-        # Send a frame with opcode=PING and fin=False, and then send a frame
-        # with opcode=TEXT (not CONTINUATION). Logical channel 4 should be
-        # dropped.
-        frame4 = _create_logical_frame(channel_id=4,
-                                       message='Ping',
-                                       fin=False,
-                                       opcode=common.OPCODE_PING)
-        request.connection.put_bytes(frame4)
-        frame5 = _create_logical_frame(channel_id=4,
-                                       message='Hello',
-                                       fin=True,
-                                       opcode=common.OPCODE_TEXT)
-        request.connection.put_bytes(frame5)
-
-        request.connection.put_bytes(
-            _create_logical_frame(channel_id=1, message='Goodbye'))
-
-        self.assertTrue(mux_handler.wait_until_done(timeout=2))
-
-        drop_channels = [
-            b for b in request.connection.get_written_control_blocks()
-            if b.opcode == mux._MUX_OPCODE_DROP_CHANNEL]
-        self.assertEqual(3, len(drop_channels))
-        for d in drop_channels:
-            self.assertEqual(mux._DROP_CODE_BAD_FRAGMENTATION,
-                             d.drop_code)
-
-
-if __name__ == '__main__':
-    unittest.main()
-
-
-# vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_stream_hixie75.py b/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_stream_hixie75.py
deleted file mode 100755
index ca9ac7130b7..00000000000
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_stream_hixie75.py
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2011, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-"""Tests for stream module."""
-
-
-import unittest
-
-import set_sys_path  # Update sys.path to locate mod_pywebsocket module.
-
-from mod_pywebsocket.stream import StreamHixie75
-from test.test_msgutil import _create_request_hixie75
-
-
-class StreamHixie75Test(unittest.TestCase):
-    """A unittest for StreamHixie75 class."""
-
-    def test_payload_length(self):
-        for length, bytes in ((0, '\x00'), (0x7f, '\x7f'), (0x80, '\x81\x00'),
-                              (0x1234, '\x80\xa4\x34')):
-            test_stream = StreamHixie75(_create_request_hixie75(bytes))
-            self.assertEqual(
-                length, test_stream._read_payload_length_hixie75())
-
-
-if __name__ == '__main__':
-    unittest.main()
-
-
-# vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/serve/serve.py b/tests/wpt/web-platform-tests/tools/serve/serve.py
index 055b60f1e76..f63bdcca5b0 100644
--- a/tests/wpt/web-platform-tests/tools/serve/serve.py
+++ b/tests/wpt/web-platform-tests/tools/serve/serve.py
@@ -592,21 +592,9 @@ class WebSocketDaemon(object):
                     "-w", handlers_root]
 
         if ssl_config is not None:
-            # This is usually done through pywebsocket.main, however we're
-            # working around that to get the server instance and manually
-            # setup the wss server.
-            if pywebsocket._import_ssl():
-                tls_module = pywebsocket._TLS_BY_STANDARD_MODULE
-            elif pywebsocket._import_pyopenssl():
-                tls_module = pywebsocket._TLS_BY_PYOPENSSL
-            else:
-                print("No SSL module available")
-                sys.exit(1)
-
             cmd_args += ["--tls",
                          "--private-key", ssl_config["key_path"],
-                         "--certificate", ssl_config["cert_path"],
-                         "--tls-module", tls_module]
+                         "--certificate", ssl_config["cert_path"]]
 
         if (bind_address):
             cmd_args = ["-H", host] + cmd_args
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/.travis.yml b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/.travis.yml
new file mode 100644
index 00000000000..2065a644dd6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/.travis.yml
@@ -0,0 +1,17 @@
+language: python
+python:
+  - 2.7
+  - 3.5
+  - 3.6
+  - 3.7
+  - 3.8
+  - nightly
+
+matrix:
+  allow_failures:
+    - python: 3.5, nightly
+install:
+  - pip install six yapf
+script:
+  - python test/run_all.py
+  - yapf --diff --recursive .
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/CONTRIBUTING b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/CONTRIBUTING
new file mode 100644
index 00000000000..f975be126fb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/CONTRIBUTING
@@ -0,0 +1,30 @@
+# How to Contribute
+
+We'd love to accept your patches and contributions to this project. There are
+just a few small guidelines you need to follow.
+
+## Contributor License Agreement
+
+Contributions to this project must be accompanied by a Contributor License
+Agreement. You (or your employer) retain the copyright to your contribution;
+this simply gives us permission to use and redistribute your contributions as
+part of the project. Head over to <https://cla.developers.google.com/> to see
+your current agreements on file or to sign a new one.
+
+You generally only need to submit a CLA once, so if you've already submitted one
+(even if it was for a different project), you probably don't need to do it
+again.
+
+## Code reviews
+
+All submissions, including submissions by project members, require review. We
+use GitHub pull requests for this purpose. Consult
+[GitHub Help](https://help.github.com/articles/about-pull-requests/) for more
+information on using pull requests.
+For instructions for contributing code, please read:
+https://github.com/google/pywebsocket/wiki/CodeReviewInstruction
+
+## Community Guidelines
+
+This project follows
+[Google's Open Source Community Guidelines](https://opensource.google/conduct/).
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/LICENSE b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/LICENSE
similarity index 98%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/LICENSE
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/LICENSE
index 989d02e4cd0..c91bea90254 100644
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/LICENSE
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2012, Google Inc.
+Copyright 2020, Google Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/MANIFEST.in b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/MANIFEST.in
similarity index 100%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/MANIFEST.in
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/MANIFEST.in
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/README.md b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/README.md
new file mode 100644
index 00000000000..277cbe550c0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/README.md
@@ -0,0 +1,36 @@
+
+# pywebsocket3 #
+
+The pywebsocket project aims to provide a [WebSocket](https://tools.ietf.org/html/rfc6455) standalone server.
+
+pywebsocket is intended for **testing** or **experimental** purposes.
+
+Run this to read the general document:
+```
+$ pydoc mod_pywebsocket
+```
+
+Please see [Wiki](../../wiki) for more details.
+
+# INSTALL #
+
+To install this package to the system, run this:
+```
+$ python setup.py build
+$ sudo python setup.py install
+```
+
+To install this package as a normal user, run this instead:
+
+```
+$ python setup.py build
+$ python setup.py install --user
+```
+# LAUNCH #
+
+To use pywebsocket as standalone server, run this to read the document:
+```
+$ pydoc mod_pywebsocket.standalone
+```
+# Disclaimer #
+This is not an officially supported Google product
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/example/abort_handshake_wsh.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/abort_handshake_wsh.py
similarity index 97%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/example/abort_handshake_wsh.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/abort_handshake_wsh.py
index 008023a1fe9..1b719ca8973 100644
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/example/abort_handshake_wsh.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/abort_handshake_wsh.py
@@ -27,7 +27,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
+from __future__ import absolute_import
 from mod_pywebsocket import handshake
 
 
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/example/abort_wsh.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/abort_wsh.py
similarity index 97%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/example/abort_wsh.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/abort_wsh.py
index 2bbf005f6a3..d4c240bf2c1 100644
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/example/abort_wsh.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/abort_wsh.py
@@ -27,7 +27,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
+from __future__ import absolute_import
 from mod_pywebsocket import handshake
 
 
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/example/arraybuffer_benchmark.html b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/arraybuffer_benchmark.html
similarity index 100%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/example/arraybuffer_benchmark.html
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/arraybuffer_benchmark.html
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/example/bench_wsh.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/bench_wsh.py
similarity index 96%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/example/bench_wsh.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/bench_wsh.py
index 5067ca7d895..2df50e77db2 100644
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/example/bench_wsh.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/bench_wsh.py
@@ -26,8 +26,6 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 """A simple load tester for WebSocket clients.
 
 A client program sends a message formatted as "<time> <count> <message>" to
@@ -36,8 +34,9 @@ containing <message> every <time> seconds. <time> can be a floating point
 value. <count> must be an integer value.
 """
 
-
+from __future__ import absolute_import
 import time
+from six.moves import range
 
 
 def web_socket_do_extra_handshake(request):
@@ -52,7 +51,7 @@ def web_socket_transfer_data(request):
     wait = float(parts[0])
     count = int(parts[1])
     message = parts[2]
-    for i in xrange(count):
+    for i in range(count):
         request.ws_stream.send_message(message)
         time.sleep(wait)
 
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/example/benchmark.html b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/benchmark.html
similarity index 99%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/example/benchmark.html
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/benchmark.html
index a923863a995..f1e5c97b3a7 100644
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/example/benchmark.html
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/benchmark.html
@@ -99,7 +99,7 @@ function init() {
     addToLog('WebSocket is not available');
   }
 
-  initWorker('WebSocket', '');
+  initWorker('');
 }
 </script>
 </head>
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/example/benchmark.js b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/benchmark.js
similarity index 75%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/example/benchmark.js
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/benchmark.js
index 856435d1d0d..2701472a4fa 100644
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/example/benchmark.js
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/benchmark.js
@@ -1,8 +1,32 @@
-// Copyright 2014 Google Inc. All rights reserved.
+// Copyright 2014, Google Inc.
+// All rights reserved.
 //
-// Use of this source code is governed by a BSD-style
-// license that can be found in the COPYING file or at
-// https://developers.google.com/open-source/licenses/bsd
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 
 if (typeof importScripts !== "undefined") {
   // Running on a worker
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/example/benchmark_helper_wsh.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/benchmark_helper_wsh.py
similarity index 88%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/example/benchmark_helper_wsh.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/benchmark_helper_wsh.py
index 44ad0bfeefc..fc175333354 100644
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/example/benchmark_helper_wsh.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/benchmark_helper_wsh.py
@@ -26,9 +26,9 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 """Handler for benchmark.html."""
+from __future__ import absolute_import
+import six
 
 
 def web_socket_do_extra_handshake(request):
@@ -37,14 +37,14 @@ def web_socket_do_extra_handshake(request):
 
 
 def web_socket_transfer_data(request):
-    data = ''
+    data = b''
 
     while True:
         command = request.ws_stream.receive_message()
         if command is None:
             return
 
-        if not isinstance(command, unicode):
+        if not isinstance(command, six.text_type):
             raise ValueError('Invalid command data:' + command)
         commands = command.split(' ')
         if len(commands) == 0:
@@ -53,19 +53,18 @@ def web_socket_transfer_data(request):
         if commands[0] == 'receive':
             if len(commands) != 2:
                 raise ValueError(
-                        'Illegal number of arguments for send command' +
-                        command)
+                    'Illegal number of arguments for send command' + command)
             size = int(commands[1])
 
             # Reuse data if possible.
             if len(data) != size:
-                data = 'a' * size
+                data = b'a' * size
             request.ws_stream.send_message(data, binary=True)
         elif commands[0] == 'send':
             if len(commands) != 2:
                 raise ValueError(
-                        'Illegal number of arguments for receive command' +
-                        command)
+                    'Illegal number of arguments for receive command' +
+                    command)
             verify_data = commands[1] == '1'
 
             data = request.ws_stream.receive_message()
@@ -74,7 +73,7 @@ def web_socket_transfer_data(request):
             size = len(data)
 
             if verify_data:
-                if data != 'a' * size:
+                if data != b'a' * size:
                     raise ValueError('Payload verification failed')
 
             request.ws_stream.send_message(str(size))
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/example/close_wsh.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/close_wsh.py
similarity index 98%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/example/close_wsh.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/close_wsh.py
index 26b08384081..8f0005ffea9 100644
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/example/close_wsh.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/close_wsh.py
@@ -27,6 +27,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+from __future__ import absolute_import
 import struct
 
 from mod_pywebsocket import common
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/example/console.html b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/console.html
similarity index 100%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/example/console.html
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/console.html
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/example/eventsource.cgi b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/cookie_wsh.py
old mode 100755
new mode 100644
similarity index 65%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/example/eventsource.cgi
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/cookie_wsh.py
index adddf237cf7..815209694e3
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/example/eventsource.cgi
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/cookie_wsh.py
@@ -1,7 +1,4 @@
-#!/usr/bin/python
-
-# Copyright 2013, Google Inc.
-# All rights reserved.
+# Copyright 2020 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
@@ -29,26 +26,29 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
-"""This CGI script generates text/event-stream type data stream for testing
-the Server-Sent Events.
-
-It will only work correctly with HTTP servers that do not buffer the output of
-CGI scripts.
-"""
+from __future__ import absolute_import
+from six.moves import urllib
 
 
-import sys
-import time
+def _add_set_cookie(request, value):
+    request.extra_headers.append(('Set-Cookie', value))
 
-sys.stdout.write('Content-type: text/event-stream\r\n\r\n')
 
-id = 0
+def web_socket_do_extra_handshake(request):
+    components = urllib.parse.urlparse(request.uri)
+    command = components[4]
 
-while True:
-  sys.stdout.write('data: Hello\r\nid: %d\r\n\r\n' % id)
-  sys.stdout.flush()
+    ONE_DAY_LIFE = 'Max-Age=86400'
 
-  id = id + 1
+    if command == 'set':
+        _add_set_cookie(request, '; '.join(['foo=bar', ONE_DAY_LIFE]))
+    elif command == 'set_httponly':
+        _add_set_cookie(
+            request, '; '.join(['httpOnlyFoo=bar', ONE_DAY_LIFE, 'httpOnly']))
+    elif command == 'clear':
+        _add_set_cookie(request, 'foo=0; Max-Age=0')
+        _add_set_cookie(request, 'httpOnlyFoo=0; Max-Age=0')
 
-  time.sleep(1)
+
+def web_socket_transfer_data(request):
+    pass
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/echo_client.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/echo_client.py
new file mode 100755
index 00000000000..e4459a19bc6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/echo_client.py
@@ -0,0 +1,696 @@
+#!/usr/bin/env python
+#
+# Copyright 2011, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+"""Simple WebSocket client named echo_client just because of historical reason.
+
+mod_pywebsocket directory must be in PYTHONPATH.
+
+Example Usage:
+
+# server setup
+ % cd $pywebsocket
+ % PYTHONPATH=$cwd/src python ./mod_pywebsocket/standalone.py -p 8880 \
+    -d $cwd/src/example
+
+# run client
+ % PYTHONPATH=$cwd/src python ./src/example/echo_client.py -p 8880 \
+     -s localhost \
+     -o http://localhost -r /echo -m test
+"""
+
+from __future__ import absolute_import
+from __future__ import print_function
+import base64
+import codecs
+from hashlib import sha1
+import logging
+from optparse import OptionParser
+import os
+import random
+import re
+import six
+import socket
+import ssl
+import struct
+import sys
+
+from mod_pywebsocket import common
+from mod_pywebsocket.extensions import PerMessageDeflateExtensionProcessor
+from mod_pywebsocket.extensions import _PerMessageDeflateFramer
+from mod_pywebsocket.extensions import _parse_window_bits
+from mod_pywebsocket.stream import Stream
+from mod_pywebsocket.stream import StreamOptions
+from mod_pywebsocket import util
+
+_TIMEOUT_SEC = 10
+_UNDEFINED_PORT = -1
+
+_UPGRADE_HEADER = 'Upgrade: websocket\r\n'
+_CONNECTION_HEADER = 'Connection: Upgrade\r\n'
+
+# Special message that tells the echo server to start closing handshake
+_GOODBYE_MESSAGE = 'Goodbye'
+
+_PROTOCOL_VERSION_HYBI13 = 'hybi13'
+
+
+class ClientHandshakeError(Exception):
+    pass
+
+
+def _build_method_line(resource):
+    return 'GET %s HTTP/1.1\r\n' % resource
+
+
+def _origin_header(header, origin):
+    # 4.1 13. concatenation of the string "Origin:", a U+0020 SPACE character,
+    # and the /origin/ value, converted to ASCII lowercase, to /fields/.
+    return '%s: %s\r\n' % (header, origin.lower())
+
+
+def _format_host_header(host, port, secure):
+    # 4.1 9. Let /hostport/ be an empty string.
+    # 4.1 10. Append the /host/ value, converted to ASCII lowercase, to
+    # /hostport/
+    hostport = host.lower()
+    # 4.1 11. If /secure/ is false, and /port/ is not 80, or if /secure/
+    # is true, and /port/ is not 443, then append a U+003A COLON character
+    # (:) followed by the value of /port/, expressed as a base-ten integer,
+    # to /hostport/
+    if ((not secure and port != common.DEFAULT_WEB_SOCKET_PORT)
+            or (secure and port != common.DEFAULT_WEB_SOCKET_SECURE_PORT)):
+        hostport += ':' + str(port)
+    # 4.1 12. concatenation of the string "Host:", a U+0020 SPACE
+    # character, and /hostport/, to /fields/.
+    return '%s: %s\r\n' % (common.HOST_HEADER, hostport)
+
+
+def _receive_bytes(socket, length):
+    recv_bytes = []
+    remaining = length
+    while remaining > 0:
+        received_bytes = socket.recv(remaining)
+        if not received_bytes:
+            raise IOError(
+                'Connection closed before receiving requested length '
+                '(requested %d bytes but received only %d bytes)' %
+                (length, length - remaining))
+        recv_bytes.append(received_bytes)
+        remaining -= len(received_bytes)
+    return b''.join(recv_bytes)
+
+
+def _get_mandatory_header(fields, name):
+    """Gets the value of the header specified by name from fields.
+
+    This function expects that there's only one header with the specified name
+    in fields. Otherwise, raises an ClientHandshakeError.
+    """
+
+    values = fields.get(name.lower())
+    if values is None or len(values) == 0:
+        raise ClientHandshakeError('%s header not found: %r' % (name, values))
+    if len(values) > 1:
+        raise ClientHandshakeError('Multiple %s headers found: %r' %
+                                   (name, values))
+    return values[0]
+
+
+def _validate_mandatory_header(fields,
+                               name,
+                               expected_value,
+                               case_sensitive=False):
+    """Gets and validates the value of the header specified by name from
+    fields.
+
+    If expected_value is specified, compares expected value and actual value
+    and raises an ClientHandshakeError on failure. You can specify case
+    sensitiveness in this comparison by case_sensitive parameter. This function
+    expects that there's only one header with the specified name in fields.
+    Otherwise, raises an ClientHandshakeError.
+    """
+
+    value = _get_mandatory_header(fields, name)
+
+    if ((case_sensitive and value != expected_value) or
+        (not case_sensitive and value.lower() != expected_value.lower())):
+        raise ClientHandshakeError(
+            'Illegal value for header %s: %r (expected) vs %r (actual)' %
+            (name, expected_value, value))
+
+
+class _TLSSocket(object):
+    """Wrapper for a TLS connection."""
+    def __init__(self, raw_socket):
+        self._logger = util.get_class_logger(self)
+
+        self._tls_socket = ssl.wrap_socket(raw_socket)
+
+        # Print cipher in use. Handshake is done on wrap_socket call.
+        self._logger.info("Cipher: %s", self._tls_socket.cipher())
+
+    def send(self, data):
+        return self._tls_socket.write(data)
+
+    def sendall(self, data):
+        return self._tls_socket.sendall(data)
+
+    def recv(self, size=-1):
+        return self._tls_socket.read(size)
+
+    def close(self):
+        return self._tls_socket.close()
+
+    def getpeername(self):
+        return self._tls_socket.getpeername()
+
+
+class ClientHandshakeBase(object):
+    """A base class for WebSocket opening handshake processors for each
+    protocol version.
+    """
+    def __init__(self):
+        self._logger = util.get_class_logger(self)
+
+    def _read_fields(self):
+        # 4.1 32. let /fields/ be a list of name-value pairs, initially empty.
+        fields = {}
+        while True:  # "Field"
+            # 4.1 33. let /name/ and /value/ be empty byte arrays
+            name = b''
+            value = b''
+            # 4.1 34. read /name/
+            name = self._read_name()
+            if name is None:
+                break
+            # 4.1 35. read spaces
+            # TODO(tyoshino): Skip only one space as described in the spec.
+            ch = self._skip_spaces()
+            # 4.1 36. read /value/
+            value = self._read_value(ch)
+            # 4.1 37. read a byte from the server
+            ch = _receive_bytes(self._socket, 1)
+            if ch != b'\n':  # 0x0A
+                raise ClientHandshakeError(
+                    'Expected LF but found %r while reading value %r for '
+                    'header %r' % (ch, value, name))
+            self._logger.debug('Received %r header', name)
+            # 4.1 38. append an entry to the /fields/ list that has the name
+            # given by the string obtained by interpreting the /name/ byte
+            # array as a UTF-8 stream and the value given by the string
+            # obtained by interpreting the /value/ byte array as a UTF-8 byte
+            # stream.
+            fields.setdefault(name.decode('UTF-8'),
+                              []).append(value.decode('UTF-8'))
+            # 4.1 39. return to the "Field" step above
+        return fields
+
+    def _read_name(self):
+        # 4.1 33. let /name/ be empty byte arrays
+        name = b''
+        while True:
+            # 4.1 34. read a byte from the server
+            ch = _receive_bytes(self._socket, 1)
+            if ch == b'\r':  # 0x0D
+                return None
+            elif ch == b'\n':  # 0x0A
+                raise ClientHandshakeError(
+                    'Unexpected LF when reading header name %r' % name)
+            elif ch == b':':  # 0x3A
+                return name.lower()
+            else:
+                name += ch
+
+    def _skip_spaces(self):
+        # 4.1 35. read a byte from the server
+        while True:
+            ch = _receive_bytes(self._socket, 1)
+            if ch == b' ':  # 0x20
+                continue
+            return ch
+
+    def _read_value(self, ch):
+        # 4.1 33. let /value/ be empty byte arrays
+        value = b''
+        # 4.1 36. read a byte from server.
+        while True:
+            if ch == b'\r':  # 0x0D
+                return value
+            elif ch == b'\n':  # 0x0A
+                raise ClientHandshakeError(
+                    'Unexpected LF when reading header value %r' % value)
+            else:
+                value += ch
+            ch = _receive_bytes(self._socket, 1)
+
+
+def _get_permessage_deflate_framer(extension_response):
+    """Validate the response and return a framer object using the parameters in
+    the response. This method doesn't accept the server_.* parameters.
+    """
+
+    client_max_window_bits = None
+    client_no_context_takeover = None
+
+    client_max_window_bits_name = (
+        PerMessageDeflateExtensionProcessor._CLIENT_MAX_WINDOW_BITS_PARAM)
+    client_no_context_takeover_name = (
+        PerMessageDeflateExtensionProcessor._CLIENT_NO_CONTEXT_TAKEOVER_PARAM)
+
+    # We didn't send any server_.* parameter.
+    # Handle those parameters as invalid if found in the response.
+
+    for param_name, param_value in extension_response.get_parameters():
+        if param_name == client_max_window_bits_name:
+            if client_max_window_bits is not None:
+                raise ClientHandshakeError('Multiple %s found' %
+                                           client_max_window_bits_name)
+
+            parsed_value = _parse_window_bits(param_value)
+            if parsed_value is None:
+                raise ClientHandshakeError(
+                    'Bad %s: %r' % (client_max_window_bits_name, param_value))
+            client_max_window_bits = parsed_value
+        elif param_name == client_no_context_takeover_name:
+            if client_no_context_takeover is not None:
+                raise ClientHandshakeError('Multiple %s found' %
+                                           client_no_context_takeover_name)
+
+            if param_value is not None:
+                raise ClientHandshakeError(
+                    'Bad %s: Has value %r' %
+                    (client_no_context_takeover_name, param_value))
+            client_no_context_takeover = True
+
+    if client_no_context_takeover is None:
+        client_no_context_takeover = False
+
+    return _PerMessageDeflateFramer(client_max_window_bits,
+                                    client_no_context_takeover)
+
+
+class ClientHandshakeProcessor(ClientHandshakeBase):
+    """WebSocket opening handshake processor
+    """
+    def __init__(self, socket, options):
+        super(ClientHandshakeProcessor, self).__init__()
+
+        self._socket = socket
+        self._options = options
+
+        self._logger = util.get_class_logger(self)
+
+    def handshake(self):
+        """Performs opening handshake on the specified socket.
+
+        Raises:
+            ClientHandshakeError: handshake failed.
+        """
+
+        request_line = _build_method_line(self._options.resource)
+        self._logger.debug('Client\'s opening handshake Request-Line: %r',
+                           request_line)
+        self._socket.sendall(request_line.encode('UTF-8'))
+
+        fields = []
+        fields.append(
+            _format_host_header(self._options.server_host,
+                                self._options.server_port,
+                                self._options.use_tls))
+        fields.append(_UPGRADE_HEADER)
+        fields.append(_CONNECTION_HEADER)
+        if self._options.origin is not None:
+            fields.append(
+                _origin_header(common.ORIGIN_HEADER, self._options.origin))
+
+        original_key = os.urandom(16)
+        self._key = base64.b64encode(original_key)
+        self._logger.debug('%s: %r (%s)', common.SEC_WEBSOCKET_KEY_HEADER,
+                           self._key, util.hexify(original_key))
+        fields.append(
+            '%s: %s\r\n' %
+            (common.SEC_WEBSOCKET_KEY_HEADER, self._key.decode('UTF-8')))
+
+        fields.append(
+            '%s: %d\r\n' %
+            (common.SEC_WEBSOCKET_VERSION_HEADER, common.VERSION_HYBI_LATEST))
+
+        extensions_to_request = []
+
+        if self._options.use_permessage_deflate:
+            extension = common.ExtensionParameter(
+                common.PERMESSAGE_DEFLATE_EXTENSION)
+            # Accept the client_max_window_bits extension parameter by default.
+            extension.add_parameter(
+                PerMessageDeflateExtensionProcessor.
+                _CLIENT_MAX_WINDOW_BITS_PARAM, None)
+            extensions_to_request.append(extension)
+
+        if len(extensions_to_request) != 0:
+            fields.append('%s: %s\r\n' %
+                          (common.SEC_WEBSOCKET_EXTENSIONS_HEADER,
+                           common.format_extensions(extensions_to_request)))
+
+        for field in fields:
+            self._socket.sendall(field.encode('UTF-8'))
+
+        self._socket.sendall(b'\r\n')
+
+        self._logger.debug('Sent client\'s opening handshake headers: %r',
+                           fields)
+        self._logger.debug('Start reading Status-Line')
+
+        status_line = b''
+        while True:
+            ch = _receive_bytes(self._socket, 1)
+            status_line += ch
+            if ch == b'\n':
+                break
+
+        m = re.match(b'HTTP/\\d+\.\\d+ (\\d\\d\\d) .*\r\n', status_line)
+        if m is None:
+            raise ClientHandshakeError('Wrong status line format: %r' %
+                                       status_line)
+        status_code = m.group(1)
+        if status_code != b'101':
+            self._logger.debug(
+                'Unexpected status code %s with following headers: %r',
+                status_code, self._read_fields())
+            raise ClientHandshakeError(
+                'Expected HTTP status code 101 but found %r' % status_code)
+
+        self._logger.debug('Received valid Status-Line')
+        self._logger.debug('Start reading headers until we see an empty line')
+
+        fields = self._read_fields()
+
+        ch = _receive_bytes(self._socket, 1)
+        if ch != b'\n':  # 0x0A
+            raise ClientHandshakeError(
+                'Expected LF but found %r while reading value %r for header '
+                'name %r' % (ch, value, name))
+
+        self._logger.debug('Received an empty line')
+        self._logger.debug('Server\'s opening handshake headers: %r', fields)
+
+        _validate_mandatory_header(fields, common.UPGRADE_HEADER,
+                                   common.WEBSOCKET_UPGRADE_TYPE, False)
+
+        _validate_mandatory_header(fields, common.CONNECTION_HEADER,
+                                   common.UPGRADE_CONNECTION_TYPE, False)
+
+        accept = _get_mandatory_header(fields,
+                                       common.SEC_WEBSOCKET_ACCEPT_HEADER)
+
+        # Validate
+        try:
+            binary_accept = base64.b64decode(accept)
+        except TypeError:
+            raise HandshakeError('Illegal value for header %s: %r' %
+                                 (common.SEC_WEBSOCKET_ACCEPT_HEADER, accept))
+
+        if len(binary_accept) != 20:
+            raise ClientHandshakeError(
+                'Decoded value of %s is not 20-byte long' %
+                common.SEC_WEBSOCKET_ACCEPT_HEADER)
+
+        self._logger.debug('Response for challenge : %r (%s)', accept,
+                           util.hexify(binary_accept))
+
+        binary_expected_accept = sha1(self._key +
+                                      common.WEBSOCKET_ACCEPT_UUID).digest()
+        expected_accept = base64.b64encode(binary_expected_accept)
+
+        self._logger.debug('Expected response for challenge: %r (%s)',
+                           expected_accept,
+                           util.hexify(binary_expected_accept))
+
+        if accept != expected_accept.decode('UTF-8'):
+            raise ClientHandshakeError(
+                'Invalid %s header: %r (expected: %s)' %
+                (common.SEC_WEBSOCKET_ACCEPT_HEADER, accept, expected_accept))
+
+        permessage_deflate_accepted = False
+
+        extensions_header = fields.get(
+            common.SEC_WEBSOCKET_EXTENSIONS_HEADER.lower())
+        accepted_extensions = []
+        if extensions_header is not None and len(extensions_header) != 0:
+            accepted_extensions = common.parse_extensions(extensions_header[0])
+
+        for extension in accepted_extensions:
+            extension_name = extension.name()
+            if (extension_name == common.PERMESSAGE_DEFLATE_EXTENSION
+                    and self._options.use_permessage_deflate):
+                permessage_deflate_accepted = True
+
+                framer = _get_permessage_deflate_framer(extension)
+                framer.set_compress_outgoing_enabled(True)
+                self._options.use_permessage_deflate = framer
+                continue
+
+            raise ClientHandshakeError('Unexpected extension %r' %
+                                       extension_name)
+
+        if (self._options.use_permessage_deflate
+                and not permessage_deflate_accepted):
+            raise ClientHandshakeError(
+                'Requested %s, but the server rejected it' %
+                common.PERMESSAGE_DEFLATE_EXTENSION)
+
+        # TODO(tyoshino): Handle Sec-WebSocket-Protocol
+        # TODO(tyoshino): Handle Cookie, etc.
+
+
+class ClientConnection(object):
+    """A wrapper for socket object to provide the mp_conn interface.
+    """
+    def __init__(self, socket):
+        self._socket = socket
+
+    def write(self, data):
+        self._socket.sendall(data)
+
+    def read(self, n):
+        return self._socket.recv(n)
+
+    def get_remote_addr(self):
+        return self._socket.getpeername()
+
+    remote_addr = property(get_remote_addr)
+
+
+class ClientRequest(object):
+    """A wrapper class just to make it able to pass a socket object to
+    functions that expect a mp_request object.
+    """
+    def __init__(self, socket):
+        self._logger = util.get_class_logger(self)
+
+        self._socket = socket
+        self.connection = ClientConnection(socket)
+        self.ws_version = common.VERSION_HYBI_LATEST
+
+
+class EchoClient(object):
+    """WebSocket echo client."""
+    def __init__(self, options):
+        self._options = options
+        self._socket = None
+
+        self._logger = util.get_class_logger(self)
+
+    def run(self):
+        """Run the client.
+
+        Shake hands and then repeat sending message and receiving its echo.
+        """
+
+        self._socket = socket.socket()
+        self._socket.settimeout(self._options.socket_timeout)
+        try:
+            self._socket.connect(
+                (self._options.server_host, self._options.server_port))
+            if self._options.use_tls:
+                self._socket = _TLSSocket(self._socket)
+
+            self._handshake = ClientHandshakeProcessor(self._socket,
+                                                       self._options)
+
+            self._handshake.handshake()
+
+            self._logger.info('Connection established')
+
+            request = ClientRequest(self._socket)
+
+            stream_option = StreamOptions()
+            stream_option.mask_send = True
+            stream_option.unmask_receive = False
+
+            if self._options.use_permessage_deflate is not False:
+                framer = self._options.use_permessage_deflate
+                framer.setup_stream_options(stream_option)
+
+            self._stream = Stream(request, stream_option)
+
+            for line in self._options.message.split(','):
+                self._stream.send_message(line)
+                if self._options.verbose:
+                    print('Send: %s' % line)
+                try:
+                    received = self._stream.receive_message()
+
+                    if self._options.verbose:
+                        print('Recv: %s' % received)
+                except Exception as e:
+                    if self._options.verbose:
+                        print('Error: %s' % e)
+                    raise
+
+            self._do_closing_handshake()
+        finally:
+            self._socket.close()
+
+    def _do_closing_handshake(self):
+        """Perform closing handshake using the specified closing frame."""
+
+        if self._options.message.split(',')[-1] == _GOODBYE_MESSAGE:
+            # requested server initiated closing handshake, so
+            # expecting closing handshake message from server.
+            self._logger.info('Wait for server-initiated closing handshake')
+            message = self._stream.receive_message()
+            if message is None:
+                print('Recv close')
+                print('Send ack')
+                self._logger.info('Received closing handshake and sent ack')
+                return
+        print('Send close')
+        self._stream.close_connection()
+        self._logger.info('Sent closing handshake')
+        print('Recv ack')
+        self._logger.info('Received ack')
+
+
+def main():
+    if six.PY2:
+        sys.stdout = codecs.getwriter('utf-8')(sys.stdout)
+
+    parser = OptionParser()
+    # We accept --command_line_flag style flags which is the same as Google
+    # gflags in addition to common --command-line-flag style flags.
+    parser.add_option('-s',
+                      '--server-host',
+                      '--server_host',
+                      dest='server_host',
+                      type='string',
+                      default='localhost',
+                      help='server host')
+    parser.add_option('-p',
+                      '--server-port',
+                      '--server_port',
+                      dest='server_port',
+                      type='int',
+                      default=_UNDEFINED_PORT,
+                      help='server port')
+    parser.add_option('-o',
+                      '--origin',
+                      dest='origin',
+                      type='string',
+                      default=None,
+                      help='origin')
+    parser.add_option('-r',
+                      '--resource',
+                      dest='resource',
+                      type='string',
+                      default='/echo',
+                      help='resource path')
+    parser.add_option('-m',
+                      '--message',
+                      dest='message',
+                      type='string',
+                      help=('comma-separated messages to send. '
+                            '%s will force close the connection from server.' %
+                            _GOODBYE_MESSAGE))
+    parser.add_option('-q',
+                      '--quiet',
+                      dest='verbose',
+                      action='store_false',
+                      default=True,
+                      help='suppress messages')
+    parser.add_option('-t',
+                      '--tls',
+                      dest='use_tls',
+                      action='store_true',
+                      default=False,
+                      help='use TLS (wss://).')
+    parser.add_option('-k',
+                      '--socket-timeout',
+                      '--socket_timeout',
+                      dest='socket_timeout',
+                      type='int',
+                      default=_TIMEOUT_SEC,
+                      help='Timeout(sec) for sockets')
+    parser.add_option('--use-permessage-deflate',
+                      '--use_permessage_deflate',
+                      dest='use_permessage_deflate',
+                      action='store_true',
+                      default=False,
+                      help='Use the permessage-deflate extension.')
+    parser.add_option('--log-level',
+                      '--log_level',
+                      type='choice',
+                      dest='log_level',
+                      default='warn',
+                      choices=['debug', 'info', 'warn', 'error', 'critical'],
+                      help='Log level.')
+
+    (options, unused_args) = parser.parse_args()
+
+    logging.basicConfig(level=logging.getLevelName(options.log_level.upper()))
+
+    # Default port number depends on whether TLS is used.
+    if options.server_port == _UNDEFINED_PORT:
+        if options.use_tls:
+            options.server_port = common.DEFAULT_WEB_SOCKET_SECURE_PORT
+        else:
+            options.server_port = common.DEFAULT_WEB_SOCKET_PORT
+
+    # optparse doesn't seem to handle non-ascii default values.
+    # Set default message here.
+    if not options.message:
+        options.message = u'Hello,\u65e5\u672c'  # "Japan" in Japanese
+
+    EchoClient(options).run()
+
+
+if __name__ == '__main__':
+    main()
+
+# vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/example/echo_noext_wsh.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/echo_noext_wsh.py
similarity index 97%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/example/echo_noext_wsh.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/echo_noext_wsh.py
index 1df51512271..eba5032218d 100644
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/example/echo_noext_wsh.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/echo_noext_wsh.py
@@ -27,6 +27,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import six
 
 _GOODBYE_MESSAGE = u'Goodbye'
 
@@ -50,7 +51,7 @@ def web_socket_transfer_data(request):
         line = request.ws_stream.receive_message()
         if line is None:
             return
-        if isinstance(line, unicode):
+        if isinstance(line, six.text_type):
             request.ws_stream.send_message(line, binary=False)
             if line == _GOODBYE_MESSAGE:
                 return
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/example/echo_wsh.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/echo_wsh.py
similarity index 97%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/example/echo_wsh.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/echo_wsh.py
index 38646c32ceb..f7b3c6c5311 100644
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/example/echo_wsh.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/echo_wsh.py
@@ -27,6 +27,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import six
 
 _GOODBYE_MESSAGE = u'Goodbye'
 
@@ -43,7 +44,7 @@ def web_socket_transfer_data(request):
         line = request.ws_stream.receive_message()
         if line is None:
             return
-        if isinstance(line, unicode):
+        if isinstance(line, six.text_type):
             request.ws_stream.send_message(line, binary=False)
             if line == _GOODBYE_MESSAGE:
                 return
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/example/handler_map.txt b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/handler_map.txt
similarity index 100%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/example/handler_map.txt
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/handler_map.txt
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/example/hsts_wsh.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/hsts_wsh.py
similarity index 100%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/example/hsts_wsh.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/hsts_wsh.py
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/example/internal_error_wsh.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/internal_error_wsh.py
similarity index 97%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/example/internal_error_wsh.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/internal_error_wsh.py
index fe581b54a64..04aa684283a 100644
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/example/internal_error_wsh.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/internal_error_wsh.py
@@ -27,7 +27,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
+from __future__ import absolute_import
 from mod_pywebsocket import msgutil
 
 
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/example/origin_check_wsh.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/origin_check_wsh.py
similarity index 100%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/example/origin_check_wsh.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/origin_check_wsh.py
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/example/eventsource.html b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/performance_test_iframe.html
similarity index 59%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/example/eventsource.html
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/performance_test_iframe.html
index 1598a8807d1..c18b2c08f6a 100644
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/example/eventsource.html
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/performance_test_iframe.html
@@ -1,5 +1,5 @@
 <!--
-Copyright 2013, Google Inc.
+Copyright 2020, Google Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -29,46 +29,9 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 
-<!--
-Simple example of the Server-Sent Events
-http://dev.w3.org/html5/eventsource/
-
-For comparison with the WebSocket Protocol & API.
-
-Run the pywebsocket with the --cgi_path parameter.
--->
-
-<html>
+<!DOCTYPE html>
 <head>
-<title>Server-Sent Events Example</title>
-<script>
-var eventSource = null;
-
-function addToLog(data) {
-  logBox.value += data + '\n';
-  logBox.scrollTop = 1000000;
-}
-
-function init() {
-  logBox = document.getElementById('log');
-
-  eventSource  = new EventSource('/eventsource.cgi');
-  eventSource.onopen = function() {
-    addToLog('onopen (readyState = ' + eventSource.readyState + ')');
-  }
-  eventSource.onmessage = function(event) {
-    addToLog(event.data);
-  }
-  eventSource.onerror = function(event) {
-    addToLog('onerror (readyState = ' + eventSource.readyState + ')');
-  }
-}
-</script>
+<script src="util.js"></script>
+<script src="performance_test_iframe.js"></script>
+<script src="benchmark.js"></script>
 </head>
-<body onload="init()">
-<textarea id="log" rows="10" cols="40" readonly></textarea>
-<p style="font-size: small">
-  Make sure that pywebsocket is run with --cgi_path parameter.
-</p>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/performance_test_iframe.js b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/performance_test_iframe.js
new file mode 100644
index 00000000000..270409aa6eb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/performance_test_iframe.js
@@ -0,0 +1,86 @@
+// Copyright 2020, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+function perfTestAddToLog(text) {
+  parent.postMessage({'command': 'log', 'value': text}, '*');
+}
+
+function perfTestAddToSummary(text) {
+}
+
+function perfTestMeasureValue(value) {
+  parent.postMessage({'command': 'measureValue', 'value': value}, '*');
+}
+
+function perfTestNotifyAbort() {
+  parent.postMessage({'command': 'notifyAbort'}, '*');
+}
+
+function getConfigForPerformanceTest(dataType, async,
+                                     verifyData, numIterations,
+                                     numWarmUpIterations) {
+
+  return {
+    prefixUrl: 'ws://' + location.host + '/benchmark_helper',
+    printSize: true,
+    numSockets: 1,
+    // + 1 is for a warmup iteration by the Telemetry framework.
+    numIterations: numIterations + numWarmUpIterations + 1,
+    numWarmUpIterations: numWarmUpIterations,
+    minTotal: 10240000,
+    startSize: 10240000,
+    stopThreshold: 10240000,
+    multipliers: [2],
+    verifyData: verifyData,
+    dataType: dataType,
+    async: async,
+    addToLog: perfTestAddToLog,
+    addToSummary: perfTestAddToSummary,
+    measureValue: perfTestMeasureValue,
+    notifyAbort: perfTestNotifyAbort
+  };
+}
+
+var data;
+onmessage = function(message) {
+  var action;
+  if (message.data.command === 'start') {
+    data = message.data;
+    initWorker('http://' + location.host);
+    action = data.benchmarkName;
+  } else {
+    action = 'stop';
+  }
+
+  var config = getConfigForPerformanceTest(data.dataType, data.async,
+                                           data.verifyData,
+                                           data.numIterations,
+                                           data.numWarmUpIterations);
+  doAction(config, data.isWorker, action);
+};
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/example/special_headers.cgi b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/special_headers.cgi
similarity index 99%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/example/special_headers.cgi
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/special_headers.cgi
index ea5080f1f1a..703cb7401b7 100755
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/example/special_headers.cgi
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/special_headers.cgi
@@ -5,14 +5,12 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the COPYING file or at
 # https://developers.google.com/open-source/licenses/bsd
-
 """CGI script sample for testing effect of HTTP headers on the origin page.
 
 Note that CGI scripts don't work on the standalone pywebsocket running in TLS
 mode.
 """
 
-
 print """Content-type: text/html
 Content-Security-Policy: connect-src self
 
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/example/util.js b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/util.js
similarity index 97%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/example/util.js
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/util.js
index 9ec0007b1ed..990160cb40c 100644
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/example/util.js
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/util.js
@@ -287,12 +287,8 @@ function stop(config) {
 
 var worker;
 
-function initWorker(connectionType, origin) {
-  var scriptPath =
-    connectionType === 'WebSocket' ? '/benchmark.js' :
-    connectionType === 'XHR' ? '/xhr_benchmark.js' :
-    '/fetch_benchmark.js'; // connectionType === 'fetch'
-  worker = new Worker(origin + scriptPath);
+function initWorker(origin) {
+  worker = new Worker(origin + '/benchmark.js');
 }
 
 function doAction(config, isWindowToWorker, action) {
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/util_main.js b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/util_main.js
new file mode 100644
index 00000000000..78add48731f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/util_main.js
@@ -0,0 +1,89 @@
+// Copyright 2014, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+// Utilities for example applications (for the main thread only).
+
+var logBox = null;
+var queuedLog = '';
+
+var summaryBox = null;
+
+function queueLog(log) {
+  queuedLog += log + '\n';
+}
+
+function addToLog(log) {
+  logBox.value += queuedLog;
+  queuedLog = '';
+  logBox.value += log + '\n';
+  logBox.scrollTop = 1000000;
+}
+
+function addToSummary(log) {
+  summaryBox.value += log + '\n';
+  summaryBox.scrollTop = 1000000;
+}
+
+// value: execution time in milliseconds.
+// config.measureValue is intended to be used in Performance Tests.
+// Do nothing here in non-PerformanceTest.
+function measureValue(value) {
+}
+
+// config.notifyAbort is called when the benchmark failed and aborted, and
+// intended to be used in Performance Tests.
+// Do nothing here in non-PerformanceTest.
+function notifyAbort() {
+}
+
+function getIntFromInput(id) {
+  return parseInt(document.getElementById(id).value);
+}
+
+function getStringFromRadioBox(name) {
+  var list = document.getElementById('benchmark_form')[name];
+  for (var i = 0; i < list.length; ++i)
+    if (list.item(i).checked)
+      return list.item(i).value;
+  return undefined;
+}
+function getBoolFromCheckBox(id) {
+  return document.getElementById(id).checked;
+}
+
+function getIntArrayFromInput(id) {
+  var strArray = document.getElementById(id).value.split(',');
+  return strArray.map(function(str) { return parseInt(str, 10); });
+}
+
+function getFloatArrayFromInput(id) {
+  var strArray = document.getElementById(id).value.split(',');
+  return strArray.map(parseFloat);
+}
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/util_worker.js b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/util_worker.js
new file mode 100644
index 00000000000..dd90449a90a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/util_worker.js
@@ -0,0 +1,44 @@
+// Copyright 2014, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+// Utilities for example applications (for the worker threads only).
+
+onmessage = function (message) {
+  var config = message.data.config;
+  config.addToLog = function(text) {
+      postMessage({type: 'addToLog', data: text}); };
+  config.addToSummary = function(text) {
+      postMessage({type: 'addToSummary', data: text}); };
+  config.measureValue = function(value) {
+      postMessage({type: 'measureValue', data: value}); };
+  config.notifyAbort = function() { postMessage({type: 'notifyAbort'}); };
+
+  doAction(config, false, message.data.type);
+};
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/__init__.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/__init__.py
similarity index 63%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/__init__.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/__init__.py
index 70933a22045..28d5f5950f3 100644
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/__init__.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/__init__.py
@@ -26,63 +26,23 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+""" A Standalone WebSocket Server for testing purposes
 
-
-"""WebSocket extension for Apache HTTP Server.
-
-mod_pywebsocket is a WebSocket extension for Apache HTTP Server
-intended for testing or experimental purposes. mod_python is required.
-
+mod_pywebsocket is an API that provides WebSocket functionalities with
+a standalone WebSocket server. It is intended for testing or
+experimental purposes.
 
 Installation
 ============
+1. Follow standalone server documentation to start running the
+standalone server. It can be read by running the following command:
 
-0. Prepare an Apache HTTP Server for which mod_python is enabled.
+    $ pydoc mod_pywebsocket.standalone
 
-1. Specify the following Apache HTTP Server directives to suit your
-   configuration.
-
-   If mod_pywebsocket is not in the Python path, specify the following.
-   <websock_lib> is the directory where mod_pywebsocket is installed.
-
-       PythonPath "sys.path+['<websock_lib>']"
-
-   Always specify the following. <websock_handlers> is the directory where
-   user-written WebSocket handlers are placed.
-
-       PythonOption mod_pywebsocket.handler_root <websock_handlers>
-       PythonHeaderParserHandler mod_pywebsocket.headerparserhandler
-
-   To limit the search for WebSocket handlers to a directory <scan_dir>
-   under <websock_handlers>, configure as follows:
-
-       PythonOption mod_pywebsocket.handler_scan <scan_dir>
-
-   <scan_dir> is useful in saving scan time when <websock_handlers>
-   contains many non-WebSocket handler files.
-
-   If you want to allow handlers whose canonical path is not under the root
-   directory (i.e. symbolic link is in root directory but its target is not),
-   configure as follows:
-
-       PythonOption mod_pywebsocket.allow_handlers_outside_root_dir On
-
-   Example snippet of httpd.conf:
-   (mod_pywebsocket is in /websock_lib, WebSocket handlers are in
-   /websock_handlers, port is 80 for ws, 443 for wss.)
-
-       <IfModule python_module>
-         PythonPath "sys.path+['/websock_lib']"
-         PythonOption mod_pywebsocket.handler_root /websock_handlers
-         PythonHeaderParserHandler mod_pywebsocket.headerparserhandler
-       </IfModule>
-
-2. Tune Apache parameters for serving WebSocket. We'd like to note that at
-   least TimeOut directive from core features and RequestReadTimeout
-   directive from mod_reqtimeout should be modified not to kill connections
-   in only a few seconds of idle time.
-
-3. Verify installation. You can use example/console.html to poke the server.
+2. Once the standalone server is launched verify it by accessing
+http://localhost[:port]/console.html. Include the port number when
+specified on launch. If everything is working correctly, you
+will see a simple echo console.
 
 
 Writing WebSocket handlers
@@ -106,8 +66,8 @@ where:
     request: mod_python request.
 
 web_socket_do_extra_handshake is called during the handshake after the
-headers are successfully parsed and WebSocket properties (ws_location,
-ws_origin, and ws_resource) are added to request. A handler
+headers are successfully parsed and WebSocket properties (ws_origin,
+and ws_resource) are added to request. A handler
 can reject the request by raising an exception.
 
 A request object has the following properties that you can use during the
@@ -115,11 +75,10 @@ extra handshake (web_socket_do_extra_handshake):
 - ws_resource
 - ws_origin
 - ws_version
-- ws_location (HyBi 00 only)
-- ws_extensions (HyBi 06 and later)
-- ws_deflate (HyBi 06 and later)
+- ws_extensions
+- ws_deflate
 - ws_protocol
-- ws_requested_protocols (HyBi 06 and later)
+- ws_requested_protocols
 
 The last two are a bit tricky. See the next subsection.
 
@@ -127,21 +86,11 @@ The last two are a bit tricky. See the next subsection.
 Subprotocol Negotiation
 -----------------------
 
-For HyBi 06 and later, ws_protocol is always set to None when
+ws_protocol is always set to None when
 web_socket_do_extra_handshake is called. If ws_requested_protocols is not
 None, you must choose one subprotocol from this list and set it to
 ws_protocol.
 
-For HyBi 00, when web_socket_do_extra_handshake is called,
-ws_protocol is set to the value given by the client in
-Sec-WebSocket-Protocol header or None if
-such header was not found in the opening handshake request. Finish extra
-handshake with ws_protocol untouched to accept the request subprotocol.
-Then, Sec-WebSocket-Protocol header will be sent to
-the client in response with the same value as requested. Raise an exception
-in web_socket_do_extra_handshake to reject the requested subprotocol.
-
-
 Data Transfer
 -------------
 
@@ -189,8 +138,8 @@ use in web_socket_passive_closing_handshake.
 Threading
 ---------
 
-A WebSocket handler must be thread-safe if the server (Apache or
-standalone.py) is configured to use threads.
+A WebSocket handler must be thread-safe. The standalone
+server uses threads by default.
 
 
 Configuring WebSocket Extension Processors
@@ -220,5 +169,4 @@ A request object has these extension processing related attributes.
   extension you want to configure from it, and call its methods.
 """
 
-
 # vi:sts=4 sw=4 et tw=72
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/test/endtoend_with_external_server.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/_stream_exceptions.py
old mode 100755
new mode 100644
similarity index 52%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/test/endtoend_with_external_server.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/_stream_exceptions.py
index 47f86fdb416..b47878bc4a3
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/test/endtoend_with_external_server.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/_stream_exceptions.py
@@ -1,6 +1,4 @@
-#!/usr/bin/env python
-#
-# Copyright 2011, Google Inc.
+# Copyright 2020, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -28,40 +26,57 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-"""Test for end-to-end with external server.
-
-This test is not run by run_all.py because it requires some preparations.
-If you would like to run this test correctly, launch Apache with mod_python
-and mod_pywebsocket manually. In addition, you should pass allow_draft75 option
-and example path as handler_scan option and Apache's DocumentRoot.
+"""Stream Exceptions.
 """
 
-
-import optparse
-import sys
-import test.test_endtoend
-import unittest
+# Note: request.connection.write/read are used in this module, even though
+# mod_python document says that they should be used only in connection
+# handlers. Unfortunately, we have no other options. For example,
+# request.write/read are not suitable because they don't allow direct raw bytes
+# writing/reading.
 
 
-_DEFAULT_WEB_SOCKET_PORT = 80
+# Exceptions
+class ConnectionTerminatedException(Exception):
+    """This exception will be raised when a connection is terminated
+    unexpectedly.
+    """
 
-
-class EndToEndTestWithExternalServer(test.test_endtoend.EndToEndTest):
     pass
 
-if __name__ == '__main__':
-    parser = optparse.OptionParser()
-    parser.add_option('-p', '--port', dest='port', type='int',
-                      default=_DEFAULT_WEB_SOCKET_PORT,
-                      help='external test server port.')
-    (options, args) = parser.parse_args()
 
-    test.test_endtoend._use_external_server = True
-    test.test_endtoend._external_server_port = options.port
+class InvalidFrameException(ConnectionTerminatedException):
+    """This exception will be raised when we received an invalid frame we
+    cannot parse.
+    """
 
-    unittest.main(argv=[sys.argv[0]])
+    pass
+
+
+class BadOperationException(Exception):
+    """This exception will be raised when send_message() is called on
+    server-terminated connection or receive_message() is called on
+    client-terminated connection.
+    """
+
+    pass
+
+
+class UnsupportedFrameException(Exception):
+    """This exception will be raised when we receive a frame with flag, opcode
+    we cannot handle. Handlers can just catch and ignore this exception and
+    call receive_message() again to continue processing the next frame.
+    """
+
+    pass
+
+
+class InvalidUTF8Exception(Exception):
+    """This exception will be raised when we receive a text frame which
+    contains invalid UTF-8 strings.
+    """
+
+    pass
 
 
 # vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/common.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/common.py
similarity index 88%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/common.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/common.py
index 9f73d66560d..9cb11f15cb2 100644
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/common.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/common.py
@@ -26,33 +26,16 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 """This file must not depend on any module specific to the WebSocket protocol.
 """
 
-
+from __future__ import absolute_import
 from mod_pywebsocket import http_header_util
 
-
 # Additional log level definitions.
 LOGLEVEL_FINE = 9
 
 # Constants indicating WebSocket protocol version.
-VERSION_HIXIE75 = -1
-VERSION_HYBI00 = 0
-VERSION_HYBI01 = 1
-VERSION_HYBI02 = 2
-VERSION_HYBI03 = 2
-VERSION_HYBI04 = 4
-VERSION_HYBI05 = 5
-VERSION_HYBI06 = 6
-VERSION_HYBI07 = 7
-VERSION_HYBI08 = 8
-VERSION_HYBI09 = 8
-VERSION_HYBI10 = 8
-VERSION_HYBI11 = 8
-VERSION_HYBI12 = 8
 VERSION_HYBI13 = 13
 VERSION_HYBI14 = 13
 VERSION_HYBI15 = 13
@@ -78,33 +61,24 @@ OPCODE_CLOSE = 0x8
 OPCODE_PING = 0x9
 OPCODE_PONG = 0xa
 
-# UUIDs used by HyBi 04 and later opening handshake and frame masking.
-WEBSOCKET_ACCEPT_UUID = '258EAFA5-E914-47DA-95CA-C5AB0DC85B11'
+# UUID for the opening handshake and frame masking.
+WEBSOCKET_ACCEPT_UUID = b'258EAFA5-E914-47DA-95CA-C5AB0DC85B11'
 
 # Opening handshake header names and expected values.
 UPGRADE_HEADER = 'Upgrade'
 WEBSOCKET_UPGRADE_TYPE = 'websocket'
-WEBSOCKET_UPGRADE_TYPE_HIXIE75 = 'WebSocket'
 CONNECTION_HEADER = 'Connection'
 UPGRADE_CONNECTION_TYPE = 'Upgrade'
 HOST_HEADER = 'Host'
 ORIGIN_HEADER = 'Origin'
-SEC_WEBSOCKET_ORIGIN_HEADER = 'Sec-WebSocket-Origin'
 SEC_WEBSOCKET_KEY_HEADER = 'Sec-WebSocket-Key'
 SEC_WEBSOCKET_ACCEPT_HEADER = 'Sec-WebSocket-Accept'
 SEC_WEBSOCKET_VERSION_HEADER = 'Sec-WebSocket-Version'
 SEC_WEBSOCKET_PROTOCOL_HEADER = 'Sec-WebSocket-Protocol'
 SEC_WEBSOCKET_EXTENSIONS_HEADER = 'Sec-WebSocket-Extensions'
-SEC_WEBSOCKET_DRAFT_HEADER = 'Sec-WebSocket-Draft'
-SEC_WEBSOCKET_KEY1_HEADER = 'Sec-WebSocket-Key1'
-SEC_WEBSOCKET_KEY2_HEADER = 'Sec-WebSocket-Key2'
-SEC_WEBSOCKET_LOCATION_HEADER = 'Sec-WebSocket-Location'
 
 # Extensions
-DEFLATE_FRAME_EXTENSION = 'deflate-frame'
 PERMESSAGE_DEFLATE_EXTENSION = 'permessage-deflate'
-X_WEBKIT_DEFLATE_FRAME_EXTENSION = 'x-webkit-deflate-frame'
-MUX_EXTENSION = 'mux_DO_NOT_USE'
 
 # Status codes
 # Code STATUS_NO_STATUS_RECEIVED, STATUS_ABNORMAL_CLOSURE, and
@@ -151,9 +125,7 @@ def is_control_opcode(opcode):
 
 
 class ExtensionParameter(object):
-
     """This is exchanged on extension negotiation in opening handshake."""
-
     def __init__(self, name):
         self._name = name
         # TODO(tyoshino): Change the data structure to more efficient one such
@@ -193,9 +165,7 @@ class ExtensionParameter(object):
 
 
 class ExtensionParsingException(Exception):
-
     """Exception to handle errors in extension parsing."""
-
     def __init__(self, name):
         super(ExtensionParsingException, self).__init__(name)
 
@@ -243,8 +213,7 @@ def _parse_extension(state):
             _parse_extension_param(state, extension)
         except ExtensionParsingException as e:
             raise ExtensionParsingException(
-                'Failed to parse parameter for %r (%r)' %
-                (extension_token, e))
+                'Failed to parse parameter for %r (%r)' % (extension_token, e))
 
     return extension
 
@@ -271,14 +240,12 @@ def parse_extensions(data):
         if not http_header_util.consume_string(state, ','):
             raise ExtensionParsingException(
                 'Failed to parse Sec-WebSocket-Extensions header: '
-                'Expected a comma but found %r' %
-                http_header_util.peek(state))
+                'Expected a comma but found %r' % http_header_util.peek(state))
 
         http_header_util.consume_lwses(state)
 
     if len(extension_list) == 0:
-        raise ExtensionParsingException(
-            'No valid extension entry found')
+        raise ExtensionParsingException('No valid extension entry found')
 
     return extension_list
 
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/dispatch.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/dispatch.py
similarity index 86%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/dispatch.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/dispatch.py
index 2591fe8b9e9..4ee943a5b80 100644
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/dispatch.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/dispatch.py
@@ -26,24 +26,21 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 """Dispatch WebSocket request.
 """
 
-
+from __future__ import absolute_import
 import logging
 import os
 import re
+import traceback
 
 from mod_pywebsocket import common
 from mod_pywebsocket import handshake
 from mod_pywebsocket import msgutil
-from mod_pywebsocket import mux
 from mod_pywebsocket import stream
 from mod_pywebsocket import util
 
-
 _SOURCE_PATH_PATTERN = re.compile(r'(?i)_wsh\.py$')
 _SOURCE_SUFFIX = '_wsh.py'
 _DO_EXTRA_HANDSHAKE_HANDLER_NAME = 'web_socket_do_extra_handshake'
@@ -54,7 +51,6 @@ _PASSIVE_CLOSING_HANDSHAKE_HANDLER_NAME = (
 
 class DispatchException(Exception):
     """Exception in dispatching WebSocket request."""
-
     def __init__(self, name, status=common.HTTP_STATUS_NOT_FOUND):
         super(DispatchException, self).__init__(name)
         self.status = status
@@ -125,7 +121,6 @@ def _enumerate_handler_file_paths(directory):
 
 class _HandlerSuite(object):
     """A handler suite holder class."""
-
     def __init__(self, do_extra_handshake, transfer_data,
                  passive_closing_handshake):
         self.do_extra_handshake = do_extra_handshake
@@ -143,10 +138,13 @@ def _source_handler_file(handler_definition):
 
     global_dic = {}
     try:
-        exec(handler_definition, global_dic)
+        # This statement is gramatically different in python 2 and 3.
+        # Hence, yapf will complain about this. To overcome this, we disable
+        # yapf for this line.
+        exec(handler_definition, global_dic) # yapf: disable
     except Exception:
         raise DispatchException('Error in sourcing handler:' +
-                                util.get_stack_trace())
+                                traceback.format_exc())
     passive_closing_handshake_handler = None
     try:
         passive_closing_handshake_handler = _extract_handler(
@@ -178,10 +176,10 @@ class Dispatcher(object):
 
     This class maintains a map from resource name to handlers.
     """
-
-    def __init__(
-        self, root_dir, scan_dir=None,
-        allow_handlers_outside_root_dir=True):
+    def __init__(self,
+                 root_dir,
+                 scan_dir=None,
+                 allow_handlers_outside_root_dir=True):
         """Construct an instance.
 
         Args:
@@ -207,11 +205,11 @@ class Dispatcher(object):
                 os.path.realpath(root_dir)):
             raise DispatchException('scan_dir:%s must be a directory under '
                                     'root_dir:%s.' % (scan_dir, root_dir))
-        self._source_handler_files_in_dir(
-            root_dir, scan_dir, allow_handlers_outside_root_dir)
+        self._source_handler_files_in_dir(root_dir, scan_dir,
+                                          allow_handlers_outside_root_dir)
 
-    def add_resource_path_alias(self,
-                                alias_resource_path, existing_resource_path):
+    def add_resource_path_alias(self, alias_resource_path,
+                                existing_resource_path):
         """Add resource path alias.
 
         Once added, request to alias_resource_path would be handled by
@@ -257,14 +255,12 @@ class Dispatcher(object):
         except handshake.AbortedByUserException as e:
             # Re-raise to tell the caller of this function to finish this
             # connection without sending any error.
-            self._logger.debug('%s', util.get_stack_trace())
+            self._logger.debug('%s', traceback.format_exc())
             raise
         except Exception as e:
             util.prepend_message_to_exception(
-                    '%s raised exception for %s: ' % (
-                            _DO_EXTRA_HANDSHAKE_HANDLER_NAME,
-                            request.ws_resource),
-                    e)
+                '%s raised exception for %s: ' %
+                (_DO_EXTRA_HANDSHAKE_HANDLER_NAME, request.ws_resource), e)
             raise handshake.HandshakeException(e, common.HTTP_STATUS_FORBIDDEN)
 
     def transfer_data(self, request):
@@ -283,21 +279,18 @@ class Dispatcher(object):
 
         # TODO(tyoshino): Terminate underlying TCP connection if possible.
         try:
-            if mux.use_mux(request):
-                mux.start(request, self)
-            else:
-                handler_suite = self.get_handler_suite(request.ws_resource)
-                if handler_suite is None:
-                    raise DispatchException('No handler for: %r' %
-                                            request.ws_resource)
-                transfer_data_ = handler_suite.transfer_data
-                transfer_data_(request)
+            handler_suite = self.get_handler_suite(request.ws_resource)
+            if handler_suite is None:
+                raise DispatchException('No handler for: %r' %
+                                        request.ws_resource)
+            transfer_data_ = handler_suite.transfer_data
+            transfer_data_(request)
 
             if not request.server_terminated:
                 request.ws_stream.close_connection()
         # Catch non-critical exceptions the handler didn't handle.
         except handshake.AbortedByUserException as e:
-            self._logger.debug('%s', util.get_stack_trace())
+            self._logger.debug('%s', traceback.format_exc())
             raise
         except msgutil.BadOperationException as e:
             self._logger.debug('%s', e)
@@ -321,9 +314,8 @@ class Dispatcher(object):
             # Any other exceptions are forwarded to the caller of this
             # function.
             util.prepend_message_to_exception(
-                '%s raised exception for %s: ' % (
-                    _TRANSFER_DATA_HANDLER_NAME, request.ws_resource),
-                e)
+                '%s raised exception for %s: ' %
+                (_TRANSFER_DATA_HANDLER_NAME, request.ws_resource), e)
             raise
 
     def passive_closing_handshake(self, request):
@@ -348,13 +340,13 @@ class Dispatcher(object):
             resource = resource.split('?', 1)[0]
         handler_suite = self._handler_suite_map.get(resource)
         if handler_suite and fragment:
-            raise DispatchException('Fragment identifiers MUST NOT be used on '
-                                    'WebSocket URIs',
-                                    common.HTTP_STATUS_BAD_REQUEST)
+            raise DispatchException(
+                'Fragment identifiers MUST NOT be used on WebSocket URIs',
+                common.HTTP_STATUS_BAD_REQUEST)
         return handler_suite
 
-    def _source_handler_files_in_dir(
-        self, root_dir, scan_dir, allow_handlers_outside_root_dir):
+    def _source_handler_files_in_dir(self, root_dir, scan_dir,
+                                     allow_handlers_outside_root_dir):
         """Source all the handler source files in the scan_dir directory.
 
         The resource path is determined relative to root_dir.
@@ -374,18 +366,18 @@ class Dispatcher(object):
             if (not allow_handlers_outside_root_dir and
                 (not os.path.realpath(path).startswith(root_realpath))):
                 self._logger.debug(
-                    'Canonical path of %s is not under root directory' %
-                    path)
+                    'Canonical path of %s is not under root directory' % path)
                 continue
             try:
-                handler_suite = _source_handler_file(open(path).read())
+                with open(path) as handler_file:
+                    handler_suite = _source_handler_file(handler_file.read())
             except DispatchException as e:
                 self._source_warnings.append('%s: %s' % (path, e))
                 continue
             resource = convert(path)
             if resource is None:
-                self._logger.debug(
-                    'Path to resource conversion on %s failed' % path)
+                self._logger.debug('Path to resource conversion on %s failed' %
+                                   path)
             else:
                 self._handler_suite_map[convert(path)] = handler_suite
 
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/extensions.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/extensions.py
similarity index 55%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/extensions.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/extensions.py
index d1be749fff5..344539f6fce 100644
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/extensions.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/extensions.py
@@ -27,19 +27,16 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
+from __future__ import absolute_import
 from mod_pywebsocket import common
 from mod_pywebsocket import util
 from mod_pywebsocket.http_header_util import quote_if_necessary
 
-
 # The list of available server side extension processor classes.
 _available_processors = {}
-_compression_extension_names = []
 
 
 class ExtensionProcessorInterface(object):
-
     def __init__(self, request):
         self._logger = util.get_class_logger(self)
 
@@ -82,26 +79,26 @@ class ExtensionProcessorInterface(object):
             self._setup_stream_options_internal(stream_options)
 
 
-def _log_outgoing_compression_ratio(
-        logger, original_bytes, filtered_bytes, average_ratio):
+def _log_outgoing_compression_ratio(logger, original_bytes, filtered_bytes,
+                                    average_ratio):
     # Print inf when ratio is not available.
     ratio = float('inf')
     if original_bytes != 0:
         ratio = float(filtered_bytes) / original_bytes
 
     logger.debug('Outgoing compression ratio: %f (average: %f)' %
-            (ratio, average_ratio))
+                 (ratio, average_ratio))
 
 
-def _log_incoming_compression_ratio(
-        logger, received_bytes, filtered_bytes, average_ratio):
+def _log_incoming_compression_ratio(logger, received_bytes, filtered_bytes,
+                                    average_ratio):
     # Print inf when ratio is not available.
     ratio = float('inf')
     if filtered_bytes != 0:
         ratio = float(received_bytes) / filtered_bytes
 
     logger.debug('Incoming compression ratio: %f (average: %f)' %
-            (ratio, average_ratio))
+                 (ratio, average_ratio))
 
 
 def _parse_window_bits(bits):
@@ -126,7 +123,6 @@ class _AverageRatioCalculator(object):
     """Stores total bytes of original and result data, and calculates average
     result / original ratio.
     """
-
     def __init__(self):
         self._total_original_bytes = 0
         self._total_result_bytes = 0
@@ -145,188 +141,6 @@ class _AverageRatioCalculator(object):
             return float('inf')
 
 
-class DeflateFrameExtensionProcessor(ExtensionProcessorInterface):
-    """deflate-frame extension processor.
-
-    Specification:
-    http://tools.ietf.org/html/draft-tyoshino-hybi-websocket-perframe-deflate
-    """
-
-    _WINDOW_BITS_PARAM = 'max_window_bits'
-    _NO_CONTEXT_TAKEOVER_PARAM = 'no_context_takeover'
-
-    def __init__(self, request):
-        ExtensionProcessorInterface.__init__(self, request)
-        self._logger = util.get_class_logger(self)
-
-        self._response_window_bits = None
-        self._response_no_context_takeover = False
-        self._bfinal = False
-
-        # Calculates
-        #     (Total outgoing bytes supplied to this filter) /
-        #     (Total bytes sent to the network after applying this filter)
-        self._outgoing_average_ratio_calculator = _AverageRatioCalculator()
-
-        # Calculates
-        #     (Total bytes received from the network) /
-        #     (Total incoming bytes obtained after applying this filter)
-        self._incoming_average_ratio_calculator = _AverageRatioCalculator()
-
-    def name(self):
-        return common.DEFLATE_FRAME_EXTENSION
-
-    def _get_extension_response_internal(self):
-        # Any unknown parameter will be just ignored.
-
-        window_bits = None
-        if self._request.has_parameter(self._WINDOW_BITS_PARAM):
-            window_bits = self._request.get_parameter_value(
-                self._WINDOW_BITS_PARAM)
-            try:
-                window_bits = _parse_window_bits(window_bits)
-            except ValueError as e:
-                return None
-
-        no_context_takeover = self._request.has_parameter(
-            self._NO_CONTEXT_TAKEOVER_PARAM)
-        if (no_context_takeover and
-            self._request.get_parameter_value(
-                self._NO_CONTEXT_TAKEOVER_PARAM) is not None):
-            return None
-
-        self._rfc1979_deflater = util._RFC1979Deflater(
-            window_bits, no_context_takeover)
-
-        self._rfc1979_inflater = util._RFC1979Inflater()
-
-        self._compress_outgoing = True
-
-        response = common.ExtensionParameter(self._request.name())
-
-        if self._response_window_bits is not None:
-            response.add_parameter(
-                self._WINDOW_BITS_PARAM, str(self._response_window_bits))
-        if self._response_no_context_takeover:
-            response.add_parameter(
-                self._NO_CONTEXT_TAKEOVER_PARAM, None)
-
-        self._logger.debug(
-            'Enable %s extension ('
-            'request: window_bits=%s; no_context_takeover=%r, '
-            'response: window_wbits=%s; no_context_takeover=%r)' %
-            (self._request.name(),
-             window_bits,
-             no_context_takeover,
-             self._response_window_bits,
-             self._response_no_context_takeover))
-
-        return response
-
-    def _setup_stream_options_internal(self, stream_options):
-
-        class _OutgoingFilter(object):
-
-            def __init__(self, parent):
-                self._parent = parent
-
-            def filter(self, frame):
-                self._parent._outgoing_filter(frame)
-
-        class _IncomingFilter(object):
-
-            def __init__(self, parent):
-                self._parent = parent
-
-            def filter(self, frame):
-                self._parent._incoming_filter(frame)
-
-        stream_options.outgoing_frame_filters.append(
-            _OutgoingFilter(self))
-        stream_options.incoming_frame_filters.insert(
-            0, _IncomingFilter(self))
-
-    def set_response_window_bits(self, value):
-        self._response_window_bits = value
-
-    def set_response_no_context_takeover(self, value):
-        self._response_no_context_takeover = value
-
-    def set_bfinal(self, value):
-        self._bfinal = value
-
-    def enable_outgoing_compression(self):
-        self._compress_outgoing = True
-
-    def disable_outgoing_compression(self):
-        self._compress_outgoing = False
-
-    def _outgoing_filter(self, frame):
-        """Transform outgoing frames. This method is called only by
-        an _OutgoingFilter instance.
-        """
-
-        original_payload_size = len(frame.payload)
-        self._outgoing_average_ratio_calculator.add_original_bytes(
-                original_payload_size)
-
-        if (not self._compress_outgoing or
-            common.is_control_opcode(frame.opcode)):
-            self._outgoing_average_ratio_calculator.add_result_bytes(
-                    original_payload_size)
-            return
-
-        frame.payload = self._rfc1979_deflater.filter(
-            frame.payload, bfinal=self._bfinal)
-        frame.rsv1 = 1
-
-        filtered_payload_size = len(frame.payload)
-        self._outgoing_average_ratio_calculator.add_result_bytes(
-                filtered_payload_size)
-
-        _log_outgoing_compression_ratio(
-                self._logger,
-                original_payload_size,
-                filtered_payload_size,
-                self._outgoing_average_ratio_calculator.get_average_ratio())
-
-    def _incoming_filter(self, frame):
-        """Transform incoming frames. This method is called only by
-        an _IncomingFilter instance.
-        """
-
-        received_payload_size = len(frame.payload)
-        self._incoming_average_ratio_calculator.add_result_bytes(
-                received_payload_size)
-
-        if frame.rsv1 != 1 or common.is_control_opcode(frame.opcode):
-            self._incoming_average_ratio_calculator.add_original_bytes(
-                    received_payload_size)
-            return
-
-        frame.payload = self._rfc1979_inflater.filter(frame.payload)
-        frame.rsv1 = 0
-
-        filtered_payload_size = len(frame.payload)
-        self._incoming_average_ratio_calculator.add_original_bytes(
-                filtered_payload_size)
-
-        _log_incoming_compression_ratio(
-                self._logger,
-                received_payload_size,
-                filtered_payload_size,
-                self._incoming_average_ratio_calculator.get_average_ratio())
-
-
-_available_processors[common.DEFLATE_FRAME_EXTENSION] = (
-    DeflateFrameExtensionProcessor)
-_compression_extension_names.append(common.DEFLATE_FRAME_EXTENSION)
-
-_available_processors[common.X_WEBKIT_DEFLATE_FRAME_EXTENSION] = (
-    DeflateFrameExtensionProcessor)
-_compression_extension_names.append(common.X_WEBKIT_DEFLATE_FRAME_EXTENSION)
-
-
 class PerMessageDeflateExtensionProcessor(ExtensionProcessorInterface):
     """permessage-deflate extension processor.
 
@@ -355,29 +169,29 @@ class PerMessageDeflateExtensionProcessor(ExtensionProcessorInterface):
 
     def _get_extension_response_internal(self):
         for name in self._request.get_parameter_names():
-            if name not in [self._SERVER_MAX_WINDOW_BITS_PARAM,
-                            self._SERVER_NO_CONTEXT_TAKEOVER_PARAM,
-                            self._CLIENT_MAX_WINDOW_BITS_PARAM]:
+            if name not in [
+                    self._SERVER_MAX_WINDOW_BITS_PARAM,
+                    self._SERVER_NO_CONTEXT_TAKEOVER_PARAM,
+                    self._CLIENT_MAX_WINDOW_BITS_PARAM
+            ]:
                 self._logger.debug('Unknown parameter: %r', name)
                 return None
 
         server_max_window_bits = None
         if self._request.has_parameter(self._SERVER_MAX_WINDOW_BITS_PARAM):
             server_max_window_bits = self._request.get_parameter_value(
-                    self._SERVER_MAX_WINDOW_BITS_PARAM)
+                self._SERVER_MAX_WINDOW_BITS_PARAM)
             try:
                 server_max_window_bits = _parse_window_bits(
                     server_max_window_bits)
             except ValueError as e:
                 self._logger.debug('Bad %s parameter: %r',
-                                   self._SERVER_MAX_WINDOW_BITS_PARAM,
-                                   e)
+                                   self._SERVER_MAX_WINDOW_BITS_PARAM, e)
                 return None
 
         server_no_context_takeover = self._request.has_parameter(
             self._SERVER_NO_CONTEXT_TAKEOVER_PARAM)
-        if (server_no_context_takeover and
-            self._request.get_parameter_value(
+        if (server_no_context_takeover and self._request.get_parameter_value(
                 self._SERVER_NO_CONTEXT_TAKEOVER_PARAM) is not None):
             self._logger.debug('%s parameter must not have a value: %r',
                                self._SERVER_NO_CONTEXT_TAKEOVER_PARAM,
@@ -388,13 +202,14 @@ class PerMessageDeflateExtensionProcessor(ExtensionProcessorInterface):
         # accept client_max_window_bits from a server or not.
         client_client_max_window_bits = self._request.has_parameter(
             self._CLIENT_MAX_WINDOW_BITS_PARAM)
-        if (client_client_max_window_bits and
-            self._request.get_parameter_value(
-                self._CLIENT_MAX_WINDOW_BITS_PARAM) is not None):
-            self._logger.debug('%s parameter must not have a value in a '
-                               'client\'s opening handshake: %r',
-                               self._CLIENT_MAX_WINDOW_BITS_PARAM,
-                               client_client_max_window_bits)
+        if (client_client_max_window_bits
+                and self._request.get_parameter_value(
+                    self._CLIENT_MAX_WINDOW_BITS_PARAM) is not None):
+            self._logger.debug(
+                '%s parameter must not have a value in a '
+                'client\'s opening handshake: %r',
+                self._CLIENT_MAX_WINDOW_BITS_PARAM,
+                client_client_max_window_bits)
             return None
 
         self._rfc1979_deflater = util._RFC1979Deflater(
@@ -405,47 +220,44 @@ class PerMessageDeflateExtensionProcessor(ExtensionProcessorInterface):
         # sent to the client.
         self._rfc1979_inflater = util._RFC1979Inflater()
 
-        self._framer = _PerMessageDeflateFramer(
-            server_max_window_bits, server_no_context_takeover)
+        self._framer = _PerMessageDeflateFramer(server_max_window_bits,
+                                                server_no_context_takeover)
         self._framer.set_bfinal(False)
         self._framer.set_compress_outgoing_enabled(True)
 
         response = common.ExtensionParameter(self._request.name())
 
         if server_max_window_bits is not None:
-            response.add_parameter(
-                self._SERVER_MAX_WINDOW_BITS_PARAM,
-                str(server_max_window_bits))
+            response.add_parameter(self._SERVER_MAX_WINDOW_BITS_PARAM,
+                                   str(server_max_window_bits))
 
         if server_no_context_takeover:
-            response.add_parameter(
-                self._SERVER_NO_CONTEXT_TAKEOVER_PARAM, None)
+            response.add_parameter(self._SERVER_NO_CONTEXT_TAKEOVER_PARAM,
+                                   None)
 
         if self._preferred_client_max_window_bits is not None:
             if not client_client_max_window_bits:
-                self._logger.debug('Processor is configured to use %s but '
-                                   'the client cannot accept it',
-                                   self._CLIENT_MAX_WINDOW_BITS_PARAM)
+                self._logger.debug(
+                    'Processor is configured to use %s but '
+                    'the client cannot accept it',
+                    self._CLIENT_MAX_WINDOW_BITS_PARAM)
                 return None
-            response.add_parameter(
-                self._CLIENT_MAX_WINDOW_BITS_PARAM,
-                str(self._preferred_client_max_window_bits))
+            response.add_parameter(self._CLIENT_MAX_WINDOW_BITS_PARAM,
+                                   str(self._preferred_client_max_window_bits))
 
         if self._client_no_context_takeover:
-            response.add_parameter(
-                self._CLIENT_NO_CONTEXT_TAKEOVER_PARAM, None)
+            response.add_parameter(self._CLIENT_NO_CONTEXT_TAKEOVER_PARAM,
+                                   None)
 
-        self._logger.debug(
-            'Enable %s extension ('
-            'request: server_max_window_bits=%s; '
-            'server_no_context_takeover=%r, '
-            'response: client_max_window_bits=%s; '
-            'client_no_context_takeover=%r)' %
-            (self._request.name(),
-             server_max_window_bits,
-             server_no_context_takeover,
-             self._preferred_client_max_window_bits,
-             self._client_no_context_takeover))
+        self._logger.debug('Enable %s extension ('
+                           'request: server_max_window_bits=%s; '
+                           'server_no_context_takeover=%r, '
+                           'response: client_max_window_bits=%s; '
+                           'client_no_context_takeover=%r)' %
+                           (self._request.name(), server_max_window_bits,
+                            server_no_context_takeover,
+                            self._preferred_client_max_window_bits,
+                            self._client_no_context_takeover))
 
         return response
 
@@ -491,7 +303,6 @@ class PerMessageDeflateExtensionProcessor(ExtensionProcessorInterface):
 
 class _PerMessageDeflateFramer(object):
     """A framer for extensions with per-message DEFLATE feature."""
-
     def __init__(self, deflate_max_window_bits, deflate_no_context_takeover):
         self._logger = util.get_class_logger(self)
 
@@ -529,19 +340,17 @@ class _PerMessageDeflateFramer(object):
 
         received_payload_size = len(message)
         self._incoming_average_ratio_calculator.add_result_bytes(
-                received_payload_size)
+            received_payload_size)
 
         message = self._rfc1979_inflater.filter(message)
 
         filtered_payload_size = len(message)
         self._incoming_average_ratio_calculator.add_original_bytes(
-                filtered_payload_size)
+            filtered_payload_size)
 
         _log_incoming_compression_ratio(
-                self._logger,
-                received_payload_size,
-                filtered_payload_size,
-                self._incoming_average_ratio_calculator.get_average_ratio())
+            self._logger, received_payload_size, filtered_payload_size,
+            self._incoming_average_ratio_calculator.get_average_ratio())
 
         return message
 
@@ -556,18 +365,17 @@ class _PerMessageDeflateFramer(object):
         self._outgoing_average_ratio_calculator.add_original_bytes(
             original_payload_size)
 
-        message = self._rfc1979_deflater.filter(
-            message, end=end, bfinal=self._bfinal)
+        message = self._rfc1979_deflater.filter(message,
+                                                end=end,
+                                                bfinal=self._bfinal)
 
         filtered_payload_size = len(message)
         self._outgoing_average_ratio_calculator.add_result_bytes(
             filtered_payload_size)
 
         _log_outgoing_compression_ratio(
-                self._logger,
-                original_payload_size,
-                filtered_payload_size,
-                self._outgoing_average_ratio_calculator.get_average_ratio())
+            self._logger, original_payload_size, filtered_payload_size,
+            self._outgoing_average_ratio_calculator.get_average_ratio())
 
         if not self._compress_ongoing:
             self._outgoing_frame_filter.set_compression_bit()
@@ -580,17 +388,14 @@ class _PerMessageDeflateFramer(object):
             frame.rsv1 = 0
 
     def _process_outgoing_frame(self, frame, compression_bit):
-        if (not compression_bit or
-            common.is_control_opcode(frame.opcode)):
+        if (not compression_bit or common.is_control_opcode(frame.opcode)):
             return
 
         frame.rsv1 = 1
 
     def setup_stream_options(self, stream_options):
         """Creates filters and sets them to the StreamOptions."""
-
         class _OutgoingMessageFilter(object):
-
             def __init__(self, parent):
                 self._parent = parent
 
@@ -599,7 +404,6 @@ class _PerMessageDeflateFramer(object):
                     message, end, binary)
 
         class _IncomingMessageFilter(object):
-
             def __init__(self, parent):
                 self._parent = parent
                 self._decompress_next_message = False
@@ -621,7 +425,6 @@ class _PerMessageDeflateFramer(object):
             self._incoming_message_filter)
 
         class _OutgoingFrameFilter(object):
-
             def __init__(self, parent):
                 self._parent = parent
                 self._set_compression_bit = False
@@ -630,12 +433,11 @@ class _PerMessageDeflateFramer(object):
                 self._set_compression_bit = True
 
             def filter(self, frame):
-                self._parent._process_outgoing_frame(
-                    frame, self._set_compression_bit)
+                self._parent._process_outgoing_frame(frame,
+                                                     self._set_compression_bit)
                 self._set_compression_bit = False
 
         class _IncomingFrameFilter(object):
-
             def __init__(self, parent):
                 self._parent = parent
 
@@ -653,82 +455,7 @@ class _PerMessageDeflateFramer(object):
 
 
 _available_processors[common.PERMESSAGE_DEFLATE_EXTENSION] = (
-        PerMessageDeflateExtensionProcessor)
-# TODO(tyoshino): Reorganize class names.
-_compression_extension_names.append('deflate')
-
-
-class MuxExtensionProcessor(ExtensionProcessorInterface):
-    """WebSocket multiplexing extension processor."""
-
-    _QUOTA_PARAM = 'quota'
-
-    def __init__(self, request):
-        ExtensionProcessorInterface.__init__(self, request)
-        self._quota = 0
-        self._extensions = []
-
-    def name(self):
-        return common.MUX_EXTENSION
-
-    def check_consistency_with_other_processors(self, processors):
-        before_mux = True
-        for processor in processors:
-            name = processor.name()
-            if name == self.name():
-                before_mux = False
-                continue
-            if not processor.is_active():
-                continue
-            if before_mux:
-                # Mux extension cannot be used after extensions
-                # that depend on frame boundary, extension data field, or any
-                # reserved bits which are attributed to each frame.
-                if (name == common.DEFLATE_FRAME_EXTENSION or
-                    name == common.X_WEBKIT_DEFLATE_FRAME_EXTENSION):
-                    self.set_active(False)
-                    return
-            else:
-                # Mux extension should not be applied before any history-based
-                # compression extension.
-                if (name == 'deflate' or
-                    name == common.DEFLATE_FRAME_EXTENSION or
-                    name == common.X_WEBKIT_DEFLATE_FRAME_EXTENSION):
-                    self.set_active(False)
-                    return
-
-    def _get_extension_response_internal(self):
-        self._active = False
-        quota = self._request.get_parameter_value(self._QUOTA_PARAM)
-        if quota is not None:
-            try:
-                quota = int(quota)
-            except ValueError as e:
-                return None
-            if quota < 0 or quota >= 2 ** 32:
-                return None
-            self._quota = quota
-
-        self._active = True
-        return common.ExtensionParameter(common.MUX_EXTENSION)
-
-    def _setup_stream_options_internal(self, stream_options):
-        pass
-
-    def set_quota(self, quota):
-        self._quota = quota
-
-    def quota(self):
-        return self._quota
-
-    def set_extensions(self, extensions):
-        self._extensions = extensions
-
-    def extensions(self):
-        return self._extensions
-
-
-_available_processors[common.MUX_EXTENSION] = MuxExtensionProcessor
+    PerMessageDeflateExtensionProcessor)
 
 
 def get_extension_processor(extension_request):
@@ -743,8 +470,4 @@ def get_extension_processor(extension_request):
     return processor_class(extension_request)
 
 
-def is_compression_extension(extension_name):
-    return extension_name in _compression_extension_names
-
-
 # vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/fast_masking.i b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/fast_masking.i
similarity index 100%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/fast_masking.i
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/fast_masking.i
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/handshake/__init__.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/handshake/__init__.py
similarity index 89%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/handshake/__init__.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/handshake/__init__.py
index 707263a69fe..82be5ae9fdf 100644
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/handshake/__init__.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/handshake/__init__.py
@@ -26,18 +26,15 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 """WebSocket opening handshake processor. This class try to apply available
 opening handshake processors for each protocol version until a connection is
 successfully established.
 """
 
-
+from __future__ import absolute_import
 import logging
 
 from mod_pywebsocket import common
-from mod_pywebsocket.handshake import hybi00
 from mod_pywebsocket.handshake import hybi
 # Export AbortedByUserException, HandshakeException, and VersionException
 # symbol from this module.
@@ -45,18 +42,15 @@ from mod_pywebsocket.handshake._base import AbortedByUserException
 from mod_pywebsocket.handshake._base import HandshakeException
 from mod_pywebsocket.handshake._base import VersionException
 
-
 _LOGGER = logging.getLogger(__name__)
 
 
-def do_handshake(request, dispatcher, allowDraft75=False, strict=False):
+def do_handshake(request, dispatcher):
     """Performs WebSocket handshake.
 
     Args:
         request: mod_python request.
         dispatcher: Dispatcher (dispatch.Dispatcher).
-        allowDraft75: obsolete argument. ignored.
-        strict: obsolete argument. ignored.
 
     Handshaker will add attributes such as ws_resource in performing
     handshake.
@@ -75,14 +69,11 @@ def do_handshake(request, dispatcher, allowDraft75=False, strict=False):
     # dict(mimetools.Message object) returns the map from header names to
     # header values. While MpTable_Type doesn't have such __str__ but just
     # __repr__ which formats itself as well as dictionary object.
-    _LOGGER.debug(
-        'Client\'s opening handshake headers: %r', dict(request.headers_in))
+    _LOGGER.debug('Client\'s opening handshake headers: %r',
+                  dict(request.headers_in))
 
     handshakers = []
-    handshakers.append(
-        ('RFC 6455', hybi.Handshaker(request, dispatcher)))
-    handshakers.append(
-        ('HyBi 00', hybi00.Handshaker(request, dispatcher)))
+    handshakers.append(('RFC 6455', hybi.Handshaker(request, dispatcher)))
 
     for name, handshaker in handshakers:
         _LOGGER.debug('Trying protocol version %s', name)
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/handshake/_base.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/handshake/_base.py
similarity index 93%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/handshake/_base.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/handshake/_base.py
index 0af05242bfc..358dd8d497d 100644
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/handshake/_base.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/handshake/_base.py
@@ -26,13 +26,11 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 """Common functions and exceptions used by WebSocket opening handshake
 processors.
 """
 
-
+from __future__ import absolute_import
 from mod_pywebsocket import common
 from mod_pywebsocket import http_header_util
 
@@ -55,7 +53,6 @@ class HandshakeException(Exception):
     """This exception will be raised when an error occurred while processing
     WebSocket initial handshake.
     """
-
     def __init__(self, name, status=None):
         super(HandshakeException, self).__init__(name)
         self.status = status
@@ -65,13 +62,12 @@ class VersionException(Exception):
     """This exception will be raised when a version of client request does not
     match with version the server supports.
     """
-
     def __init__(self, name, supported_versions=''):
         """Construct an instance.
 
         Args:
             supported_version: a str object to show supported hybi versions.
-                               (e.g. '8, 13')
+                               (e.g. '13')
         """
         super(VersionException, self).__init__(name)
         self.supported_versions = supported_versions
@@ -116,7 +112,7 @@ def parse_host_header(request):
 
 
 def format_header(name, value):
-    return '%s: %s\r\n' % (name, value)
+    return u'%s: %s\r\n' % (name, value)
 
 
 def get_mandatory_header(request, key):
@@ -132,16 +128,17 @@ def validate_mandatory_header(request, key, expected_value, fail_status=None):
     if value.lower() != expected_value.lower():
         raise HandshakeException(
             'Expected %r for header %s but found %r (case-insensitive)' %
-            (expected_value, key, value), status=fail_status)
+            (expected_value, key, value),
+            status=fail_status)
 
 
 def check_request_line(request):
     # 5.1 1. The three character UTF-8 string "GET".
     # 5.1 2. A UTF-8-encoded U+0020 SPACE character (0x20 byte).
-    if request.method != 'GET':
+    if request.method != u'GET':
         raise HandshakeException('Method is not GET: %r' % request.method)
 
-    if request.protocol != 'HTTP/1.1':
+    if request.protocol != u'HTTP/1.1':
         raise HandshakeException('Version is not HTTP/1.1: %r' %
                                  request.protocol)
 
@@ -168,8 +165,8 @@ def parse_token_list(data):
             break
 
         if not http_header_util.consume_string(state, ','):
-            raise HandshakeException(
-                'Expected a comma but found %r' % http_header_util.peek(state))
+            raise HandshakeException('Expected a comma but found %r' %
+                                     http_header_util.peek(state))
 
         http_header_util.consume_lwses(state)
 
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/handshake/hybi.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/handshake/hybi.py
similarity index 71%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/handshake/hybi.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/handshake/hybi.py
index 2dbf25a1dcc..7fd63eb63ed 100644
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/handshake/hybi.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/handshake/hybi.py
@@ -26,8 +26,6 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 """This file provides the opening handshake processor for the WebSocket
 protocol (RFC 6455).
 
@@ -35,21 +33,15 @@ Specification:
 http://tools.ietf.org/html/rfc6455
 """
 
-
-# Note: request.connection.write is used in this module, even though mod_python
-# document says that it should be used only in connection handlers.
-# Unfortunately, we have no other options. For example, request.write is not
-# suitable because it doesn't allow direct raw bytes writing.
-
-
+from __future__ import absolute_import
 import base64
 import logging
 import os
 import re
+from hashlib import sha1
 
 from mod_pywebsocket import common
 from mod_pywebsocket.extensions import get_extension_processor
-from mod_pywebsocket.extensions import is_compression_extension
 from mod_pywebsocket.handshake._base import check_request_line
 from mod_pywebsocket.handshake._base import format_header
 from mod_pywebsocket.handshake._base import get_mandatory_header
@@ -61,7 +53,8 @@ from mod_pywebsocket.handshake._base import VersionException
 from mod_pywebsocket.stream import Stream
 from mod_pywebsocket.stream import StreamOptions
 from mod_pywebsocket import util
-
+from six.moves import map
+from six.moves import range
 
 # Used to validate the value in the Sec-WebSocket-Key header strictly. RFC 4648
 # disallows non-zero padding, so the character right before == must be any of
@@ -81,16 +74,24 @@ def compute_accept(key):
     Sec-WebSocket-Key header.
     """
 
-    accept_binary = util.sha1_hash(
-        key + common.WEBSOCKET_ACCEPT_UUID).digest()
+    accept_binary = sha1(key + common.WEBSOCKET_ACCEPT_UUID).digest()
     accept = base64.b64encode(accept_binary)
 
-    return (accept, accept_binary)
+    return accept
+
+
+def compute_accept_from_unicode(unicode_key):
+    """A wrapper function for compute_accept which takes a unicode string as an
+    argument, and encodes it to byte string. It then passes it on to
+    compute_accept.
+    """
+
+    key = unicode_key.encode('UTF-8')
+    return compute_accept(key)
 
 
 class Handshaker(object):
     """Opening handshake processor for the WebSocket protocol (RFC 6455)."""
-
     def __init__(self, request, dispatcher):
         """Construct an instance.
 
@@ -107,14 +108,14 @@ class Handshaker(object):
         self._dispatcher = dispatcher
 
     def _validate_connection_header(self):
-        connection = get_mandatory_header(
-            self._request, common.CONNECTION_HEADER)
+        connection = get_mandatory_header(self._request,
+                                          common.CONNECTION_HEADER)
 
         try:
             connection_tokens = parse_token_list(connection)
         except HandshakeException as e:
-            raise HandshakeException(
-                'Failed to parse %s: %s' % (common.CONNECTION_HEADER, e))
+            raise HandshakeException('Failed to parse %s: %s' %
+                                     (common.CONNECTION_HEADER, e))
 
         connection_is_valid = False
         for token in connection_tokens:
@@ -134,10 +135,8 @@ class Handshaker(object):
 
         check_request_line(self._request)
 
-        validate_mandatory_header(
-            self._request,
-            common.UPGRADE_HEADER,
-            common.WEBSOCKET_UPGRADE_TYPE)
+        validate_mandatory_header(self._request, common.UPGRADE_HEADER,
+                                  common.WEBSOCKET_UPGRADE_TYPE)
 
         self._validate_connection_header()
 
@@ -155,12 +154,10 @@ class Handshaker(object):
             # Key validation, response generation.
 
             key = self._get_key()
-            (accept, accept_binary) = compute_accept(key)
-            self._logger.debug(
-                '%s: %r (%s)',
-                common.SEC_WEBSOCKET_ACCEPT_HEADER,
-                accept,
-                util.hexify(accept_binary))
+            accept = compute_accept(key)
+            self._logger.debug('%s: %r (%s)',
+                               common.SEC_WEBSOCKET_ACCEPT_HEADER, accept,
+                               util.hexify(base64.b64decode(accept)))
 
             self._logger.debug('Protocol version is RFC 6455')
 
@@ -182,8 +179,11 @@ class Handshaker(object):
 
             # Extra handshake handler may modify/remove processors.
             self._dispatcher.do_extra_handshake(self._request)
-            processors = filter(lambda processor: processor is not None,
-                                self._request.ws_extension_processors)
+            processors = [
+                processor
+                for processor in self._request.ws_extension_processors
+                if processor is not None
+            ]
 
             # Ask each processor if there are extensions on the request which
             # cannot co-exist. When processor decided other processors cannot
@@ -194,35 +194,12 @@ class Handshaker(object):
                 if processor.is_active():
                     processor.check_consistency_with_other_processors(
                         processors)
-            processors = filter(lambda processor: processor.is_active(),
-                                processors)
+            processors = [
+                processor for processor in processors if processor.is_active()
+            ]
 
             accepted_extensions = []
 
-            # We need to take into account of mux extension here.
-            # If mux extension exists:
-            # - Remove processors of extensions for logical channel,
-            #   which are processors located before the mux processor
-            # - Pass extension requests for logical channel to mux processor
-            # - Attach the mux processor to the request. It will be referred
-            #   by dispatcher to see whether the dispatcher should use mux
-            #   handler or not.
-            mux_index = -1
-            for i, processor in enumerate(processors):
-                if processor.name() == common.MUX_EXTENSION:
-                    mux_index = i
-                    break
-            if mux_index >= 0:
-                logical_channel_extensions = []
-                for processor in processors[:mux_index]:
-                    logical_channel_extensions.append(processor.request())
-                    processor.set_active(False)
-                self._request.mux_processor = processors[mux_index]
-                self._request.mux_processor.set_extensions(
-                    logical_channel_extensions)
-                processors = filter(lambda processor: processor.is_active(),
-                                    processors)
-
             stream_options = StreamOptions()
 
             for index, processor in enumerate(processors):
@@ -238,19 +215,17 @@ class Handshaker(object):
 
                 processor.setup_stream_options(stream_options)
 
-                if not is_compression_extension(processor.name()):
-                    continue
-
                 # Inactivate all of the following compression extensions.
-                for j in xrange(index + 1, len(processors)):
-                    if is_compression_extension(processors[j].name()):
-                        processors[j].set_active(False)
+                for j in range(index + 1, len(processors)):
+                    processors[j].set_active(False)
 
             if len(accepted_extensions) > 0:
                 self._request.ws_extensions = accepted_extensions
                 self._logger.debug(
                     'Extensions accepted: %r',
-                    map(common.ExtensionParameter.name, accepted_extensions))
+                    list(
+                        map(common.ExtensionParameter.name,
+                            accepted_extensions)))
             else:
                 self._request.ws_extensions = None
 
@@ -263,9 +238,8 @@ class Handshaker(object):
                         'ws_requested_protocols and set it to ws_protocol')
                 validate_subprotocol(self._request.ws_protocol)
 
-                self._logger.debug(
-                    'Subprotocol accepted: %r',
-                    self._request.ws_protocol)
+                self._logger.debug('Subprotocol accepted: %r',
+                                   self._request.ws_protocol)
             else:
                 if self._request.ws_protocol is not None:
                     raise HandshakeException(
@@ -297,10 +271,10 @@ class Handshaker(object):
                 'Multiple versions (%r) are not allowed for header %s' %
                 (version, common.SEC_WEBSOCKET_VERSION_HEADER),
                 status=common.HTTP_STATUS_BAD_REQUEST)
-        raise VersionException(
-            'Unsupported version %r for header %s' %
-            (version, common.SEC_WEBSOCKET_VERSION_HEADER),
-            supported_versions=', '.join(map(str, _SUPPORTED_VERSIONS)))
+        raise VersionException('Unsupported version %r for header %s' %
+                               (version, common.SEC_WEBSOCKET_VERSION_HEADER),
+                               supported_versions=', '.join(
+                                   map(str, _SUPPORTED_VERSIONS)))
 
     def _set_protocol(self):
         self._request.ws_protocol = None
@@ -333,8 +307,9 @@ class Handshaker(object):
 
         self._logger.debug(
             'Extensions requested: %r',
-            map(common.ExtensionParameter.name,
-                self._request.ws_requested_extensions))
+            list(
+                map(common.ExtensionParameter.name,
+                    self._request.ws_requested_extensions)))
 
     def _validate_key(self, key):
         if key.find(',') >= 0:
@@ -357,25 +332,21 @@ class Handshaker(object):
             pass
 
         if not key_is_valid:
-            raise HandshakeException(
-                'Illegal value for header %s: %r' %
-                (common.SEC_WEBSOCKET_KEY_HEADER, key))
+            raise HandshakeException('Illegal value for header %s: %r' %
+                                     (common.SEC_WEBSOCKET_KEY_HEADER, key))
 
         return decoded_key
 
     def _get_key(self):
-        key = get_mandatory_header(
-            self._request, common.SEC_WEBSOCKET_KEY_HEADER)
+        key = get_mandatory_header(self._request,
+                                   common.SEC_WEBSOCKET_KEY_HEADER)
 
         decoded_key = self._validate_key(key)
 
-        self._logger.debug(
-            '%s: %r (%s)',
-            common.SEC_WEBSOCKET_KEY_HEADER,
-            key,
-            util.hexify(decoded_key))
+        self._logger.debug('%s: %r (%s)', common.SEC_WEBSOCKET_KEY_HEADER, key,
+                           util.hexify(decoded_key))
 
-        return key
+        return key.encode('UTF-8')
 
     def _create_stream(self, stream_options):
         return Stream(self._request, stream_options)
@@ -383,36 +354,40 @@ class Handshaker(object):
     def _create_handshake_response(self, accept):
         response = []
 
-        response.append('HTTP/1.1 101 Switching Protocols\r\n')
+        response.append(u'HTTP/1.1 101 Switching Protocols\r\n')
 
         # WebSocket headers
-        response.append(format_header(
-            common.UPGRADE_HEADER, common.WEBSOCKET_UPGRADE_TYPE))
-        response.append(format_header(
-            common.CONNECTION_HEADER, common.UPGRADE_CONNECTION_TYPE))
-        response.append(format_header(
-            common.SEC_WEBSOCKET_ACCEPT_HEADER, accept))
+        response.append(
+            format_header(common.UPGRADE_HEADER,
+                          common.WEBSOCKET_UPGRADE_TYPE))
+        response.append(
+            format_header(common.CONNECTION_HEADER,
+                          common.UPGRADE_CONNECTION_TYPE))
+        response.append(
+            format_header(common.SEC_WEBSOCKET_ACCEPT_HEADER,
+                          accept.decode('UTF-8')))
         if self._request.ws_protocol is not None:
-            response.append(format_header(
-                common.SEC_WEBSOCKET_PROTOCOL_HEADER,
-                self._request.ws_protocol))
-        if (self._request.ws_extensions is not None and
-            len(self._request.ws_extensions) != 0):
-            response.append(format_header(
-                common.SEC_WEBSOCKET_EXTENSIONS_HEADER,
-                common.format_extensions(self._request.ws_extensions)))
+            response.append(
+                format_header(common.SEC_WEBSOCKET_PROTOCOL_HEADER,
+                              self._request.ws_protocol))
+        if (self._request.ws_extensions is not None
+                and len(self._request.ws_extensions) != 0):
+            response.append(
+                format_header(
+                    common.SEC_WEBSOCKET_EXTENSIONS_HEADER,
+                    common.format_extensions(self._request.ws_extensions)))
 
         # Headers not specific for WebSocket
         for name, value in self._request.extra_headers:
             response.append(format_header(name, value))
 
-        response.append('\r\n')
+        response.append(u'\r\n')
 
-        return ''.join(response)
+        return u''.join(response)
 
     def _send_handshake(self, accept):
         raw_response = self._create_handshake_response(accept)
-        self._request.connection.write(raw_response)
+        self._request.connection.write(raw_response.encode('UTF-8'))
         self._logger.debug('Sent server\'s opening handshake: %r',
                            raw_response)
 
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/http_header_util.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/http_header_util.py
similarity index 92%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/http_header_util.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/http_header_util.py
index 8e0584c5dac..ded90b247b8 100644
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/http_header_util.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/http_header_util.py
@@ -26,15 +26,12 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 """Utilities for parsing and formatting headers that follow the grammar defined
 in HTTP RFC http://www.ietf.org/rfc/rfc2616.txt.
 """
 
-
-from six.moves import urllib
-
+from __future__ import absolute_import
+import six.moves.urllib.parse
 
 _SEPARATORS = '()<>@,;:\\"/[]?={} \t'
 
@@ -52,7 +49,6 @@ def _is_ctl(c):
 
 
 class ParsingState(object):
-
     def __init__(self, data):
         self.data = data
         self.head = 0
@@ -218,7 +214,7 @@ def quote_if_necessary(s):
 def parse_uri(uri):
     """Parse absolute URI then return host, port and resource."""
 
-    parsed = urllib.parse.urlsplit(uri)
+    parsed = six.moves.urllib.parse.urlsplit(uri)
     if parsed.scheme != 'wss' and parsed.scheme != 'ws':
         # |uri| must be a relative URI.
         # TODO(toyoshim): Should validate |uri|.
@@ -230,9 +226,12 @@ def parse_uri(uri):
     port = None
     try:
         port = parsed.port
-    except ValueError as e:
-        # port property cause ValueError on invalid null port description like
-        # 'ws://host:/path'.
+    except ValueError:
+        # The port property cause ValueError on invalid null port descriptions
+        # like 'ws://host:INVALID_PORT/path', where the assigned port is not
+        # *DIGIT. For python 3.6 and later, ValueError also raises when
+        # assigning invalid port numbers such as 'ws://host:-1/path'. Earlier
+        # versions simply return None and ignore invalid port attributes.
         return None, None, None
 
     if port is None:
@@ -252,12 +251,4 @@ def parse_uri(uri):
     return parsed.hostname, port, path
 
 
-try:
-    urllib.parse.uses_netloc.index('ws')
-except ValueError as e:
-    # urlparse in Python2.5.1 doesn't have 'ws' and 'wss' entries.
-    urllib.parse.uses_netloc.append('ws')
-    urllib.parse.uses_netloc.append('wss')
-
-
 # vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/memorizingfile.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/memorizingfile.py
similarity index 96%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/memorizingfile.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/memorizingfile.py
index c7afcc157ed..d3539676184 100644
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/memorizingfile.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/memorizingfile.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+#
 # Copyright 2011, Google Inc.
 # All rights reserved.
 #
@@ -26,24 +28,23 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 """Memorizing file.
 
 A memorizing file wraps a file and memorizes lines read by readline.
 """
 
+from __future__ import absolute_import
+import sys
+
 
 class MemorizingFile(object):
-
     """MemorizingFile wraps a file and memorizes lines read by readline.
 
     Note that data read by other methods are not memorized. This behavior
     is good enough for memorizing lines SimpleHTTPServer reads before
     the control reaches WebSocketRequestHandler.
     """
-
-    def __init__(self, file_, max_memorized_lines=0x7FFFFFFF):
+    def __init__(self, file_, max_memorized_lines=sys.maxsize):
         """Construct an instance.
 
         Args:
@@ -60,7 +61,7 @@ class MemorizingFile(object):
 
     def __getattribute__(self, name):
         """Return a file attribute.
-
+        
         Returns the value overridden by this class for some attributes,
         and forwards the call to _file for the other attributes.
         """
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/msgutil.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/msgutil.py
similarity index 93%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/msgutil.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/msgutil.py
index fc6c5b1dbce..f58ca78e14a 100644
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/msgutil.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/msgutil.py
@@ -26,8 +26,6 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 """Message related utilities.
 
 Note: request.connection.write/read are used in this module, even though
@@ -37,16 +35,15 @@ request.write/read are not suitable because they don't allow direct raw
 bytes writing/reading.
 """
 
-
-from six.moves import queue
+from __future__ import absolute_import
+import six.moves.queue
 import threading
 
-
 # Export Exception symbols from msgutil for backward compatibility
-from mod_pywebsocket._stream_base import ConnectionTerminatedException
-from mod_pywebsocket._stream_base import InvalidFrameException
-from mod_pywebsocket._stream_base import BadOperationException
-from mod_pywebsocket._stream_base import UnsupportedFrameException
+from mod_pywebsocket._stream_exceptions import ConnectionTerminatedException
+from mod_pywebsocket._stream_exceptions import InvalidFrameException
+from mod_pywebsocket._stream_exceptions import BadOperationException
+from mod_pywebsocket._stream_exceptions import UnsupportedFrameException
 
 
 # An API for handler to send/receive WebSocket messages.
@@ -95,7 +92,7 @@ def receive_message(request):
     return request.ws_stream.receive_message()
 
 
-def send_ping(request, body=''):
+def send_ping(request, body):
     request.ws_stream.send_ping(body)
 
 
@@ -109,7 +106,6 @@ class MessageReceiver(threading.Thread):
     because pyOpenSSL used by the server raises a fatal error if the socket
     is accessed from multiple threads.
     """
-
     def __init__(self, request, onmessage=None):
         """Construct an instance.
 
@@ -124,7 +120,7 @@ class MessageReceiver(threading.Thread):
 
         threading.Thread.__init__(self)
         self._request = request
-        self._queue = queue.Queue()
+        self._queue = six.moves.queue.Queue()
         self._onmessage = onmessage
         self._stop_requested = False
         self.setDaemon(True)
@@ -157,7 +153,7 @@ class MessageReceiver(threading.Thread):
         """
         try:
             message = self._queue.get_nowait()
-        except queue.Empty:
+        except six.moves.queue.Empty:
             message = None
         return message
 
@@ -181,7 +177,6 @@ class MessageSender(threading.Thread):
     because pyOpenSSL used by the server raises a fatal error if the socket
     is accessed from multiple threads.
     """
-
     def __init__(self, request):
         """Construct an instance.
 
@@ -190,7 +185,7 @@ class MessageSender(threading.Thread):
         """
         threading.Thread.__init__(self)
         self._request = request
-        self._queue = queue.Queue()
+        self._queue = six.moves.queue.Queue()
         self.setDaemon(True)
         self.start()
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/request_handler.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/request_handler.py
new file mode 100644
index 00000000000..e038d9f43ac
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/request_handler.py
@@ -0,0 +1,319 @@
+# Copyright 2020, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+"""Request Handler and Request/Connection classes for standalone server.
+"""
+
+import os
+
+from six.moves import CGIHTTPServer
+from six.moves import http_client
+
+from mod_pywebsocket import common
+from mod_pywebsocket import dispatch
+from mod_pywebsocket import handshake
+from mod_pywebsocket import http_header_util
+from mod_pywebsocket import memorizingfile
+from mod_pywebsocket import util
+
+# 1024 is practically large enough to contain WebSocket handshake lines.
+_MAX_MEMORIZED_LINES = 1024
+
+
+class _StandaloneConnection(object):
+    """Mimic mod_python mp_conn."""
+    def __init__(self, request_handler):
+        """Construct an instance.
+
+        Args:
+            request_handler: A WebSocketRequestHandler instance.
+        """
+
+        self._request_handler = request_handler
+
+    def get_local_addr(self):
+        """Getter to mimic mp_conn.local_addr."""
+
+        return (self._request_handler.server.server_name,
+                self._request_handler.server.server_port)
+
+    local_addr = property(get_local_addr)
+
+    def get_remote_addr(self):
+        """Getter to mimic mp_conn.remote_addr.
+
+        Setting the property in __init__ won't work because the request
+        handler is not initialized yet there."""
+
+        return self._request_handler.client_address
+
+    remote_addr = property(get_remote_addr)
+
+    def write(self, data):
+        """Mimic mp_conn.write()."""
+
+        return self._request_handler.wfile.write(data)
+
+    def read(self, length):
+        """Mimic mp_conn.read()."""
+
+        return self._request_handler.rfile.read(length)
+
+    def get_memorized_lines(self):
+        """Get memorized lines."""
+
+        return self._request_handler.rfile.get_memorized_lines()
+
+
+class _StandaloneRequest(object):
+    """Mimic mod_python request."""
+    def __init__(self, request_handler, use_tls):
+        """Construct an instance.
+
+        Args:
+            request_handler: A WebSocketRequestHandler instance.
+        """
+
+        self._logger = util.get_class_logger(self)
+
+        self._request_handler = request_handler
+        self.connection = _StandaloneConnection(request_handler)
+        self._use_tls = use_tls
+        self.headers_in = request_handler.headers
+
+    def get_uri(self):
+        """Getter to mimic request.uri.
+
+        This method returns the raw data at the Request-URI part of the
+        Request-Line, while the uri method on the request object of mod_python
+        returns the path portion after parsing the raw data. This behavior is
+        kept for compatibility.
+        """
+
+        return self._request_handler.path
+
+    uri = property(get_uri)
+
+    def get_unparsed_uri(self):
+        """Getter to mimic request.unparsed_uri."""
+
+        return self._request_handler.path
+
+    unparsed_uri = property(get_unparsed_uri)
+
+    def get_method(self):
+        """Getter to mimic request.method."""
+
+        return self._request_handler.command
+
+    method = property(get_method)
+
+    def get_protocol(self):
+        """Getter to mimic request.protocol."""
+
+        return self._request_handler.request_version
+
+    protocol = property(get_protocol)
+
+    def is_https(self):
+        """Mimic request.is_https()."""
+
+        return self._use_tls
+
+
+class WebSocketRequestHandler(CGIHTTPServer.CGIHTTPRequestHandler):
+    """CGIHTTPRequestHandler specialized for WebSocket."""
+
+    # Use httplib.HTTPMessage instead of mimetools.Message.
+    MessageClass = http_client.HTTPMessage
+
+    def setup(self):
+        """Override SocketServer.StreamRequestHandler.setup to wrap rfile
+        with MemorizingFile.
+
+        This method will be called by BaseRequestHandler's constructor
+        before calling BaseHTTPRequestHandler.handle.
+        BaseHTTPRequestHandler.handle will call
+        BaseHTTPRequestHandler.handle_one_request and it will call
+        WebSocketRequestHandler.parse_request.
+        """
+
+        # Call superclass's setup to prepare rfile, wfile, etc. See setup
+        # definition on the root class SocketServer.StreamRequestHandler to
+        # understand what this does.
+        CGIHTTPServer.CGIHTTPRequestHandler.setup(self)
+
+        self.rfile = memorizingfile.MemorizingFile(
+            self.rfile, max_memorized_lines=_MAX_MEMORIZED_LINES)
+
+    def __init__(self, request, client_address, server):
+        self._logger = util.get_class_logger(self)
+
+        self._options = server.websocket_server_options
+
+        # Overrides CGIHTTPServerRequestHandler.cgi_directories.
+        self.cgi_directories = self._options.cgi_directories
+        # Replace CGIHTTPRequestHandler.is_executable method.
+        if self._options.is_executable_method is not None:
+            self.is_executable = self._options.is_executable_method
+
+        # This actually calls BaseRequestHandler.__init__.
+        CGIHTTPServer.CGIHTTPRequestHandler.__init__(self, request,
+                                                     client_address, server)
+
+    def parse_request(self):
+        """Override BaseHTTPServer.BaseHTTPRequestHandler.parse_request.
+
+        Return True to continue processing for HTTP(S), False otherwise.
+
+        See BaseHTTPRequestHandler.handle_one_request method which calls
+        this method to understand how the return value will be handled.
+        """
+
+        # We hook parse_request method, but also call the original
+        # CGIHTTPRequestHandler.parse_request since when we return False,
+        # CGIHTTPRequestHandler.handle_one_request continues processing and
+        # it needs variables set by CGIHTTPRequestHandler.parse_request.
+        #
+        # Variables set by this method will be also used by WebSocket request
+        # handling (self.path, self.command, self.requestline, etc. See also
+        # how _StandaloneRequest's members are implemented using these
+        # attributes).
+        if not CGIHTTPServer.CGIHTTPRequestHandler.parse_request(self):
+            return False
+
+        if self._options.use_basic_auth:
+            auth = self.headers.getheader('Authorization')
+            if auth != self._options.basic_auth_credential:
+                self.send_response(401)
+                self.send_header('WWW-Authenticate',
+                                 'Basic realm="Pywebsocket"')
+                self.end_headers()
+                self._logger.info('Request basic authentication')
+                return False
+
+        host, port, resource = http_header_util.parse_uri(self.path)
+        if resource is None:
+            self._logger.info('Invalid URI: %r', self.path)
+            self._logger.info('Fallback to CGIHTTPRequestHandler')
+            return True
+        server_options = self.server.websocket_server_options
+        if host is not None:
+            validation_host = server_options.validation_host
+            if validation_host is not None and host != validation_host:
+                self._logger.info('Invalid host: %r (expected: %r)', host,
+                                  validation_host)
+                self._logger.info('Fallback to CGIHTTPRequestHandler')
+                return True
+        if port is not None:
+            validation_port = server_options.validation_port
+            if validation_port is not None and port != validation_port:
+                self._logger.info('Invalid port: %r (expected: %r)', port,
+                                  validation_port)
+                self._logger.info('Fallback to CGIHTTPRequestHandler')
+                return True
+        self.path = resource
+
+        request = _StandaloneRequest(self, self._options.use_tls)
+
+        try:
+            # Fallback to default http handler for request paths for which
+            # we don't have request handlers.
+            if not self._options.dispatcher.get_handler_suite(self.path):
+                self._logger.info('No handler for resource: %r', self.path)
+                self._logger.info('Fallback to CGIHTTPRequestHandler')
+                return True
+        except dispatch.DispatchException as e:
+            self._logger.info('Dispatch failed for error: %s', e)
+            self.send_error(e.status)
+            return False
+
+        # If any Exceptions without except clause setup (including
+        # DispatchException) is raised below this point, it will be caught
+        # and logged by WebSocketServer.
+
+        try:
+            try:
+                handshake.do_handshake(request, self._options.dispatcher)
+            except handshake.VersionException as e:
+                self._logger.info('Handshake failed for version error: %s', e)
+                self.send_response(common.HTTP_STATUS_BAD_REQUEST)
+                self.send_header(common.SEC_WEBSOCKET_VERSION_HEADER,
+                                 e.supported_versions)
+                self.end_headers()
+                return False
+            except handshake.HandshakeException as e:
+                # Handshake for ws(s) failed.
+                self._logger.info('Handshake failed for error: %s', e)
+                self.send_error(e.status)
+                return False
+
+            request._dispatcher = self._options.dispatcher
+            self._options.dispatcher.transfer_data(request)
+        except handshake.AbortedByUserException as e:
+            self._logger.info('Aborted: %s', e)
+        return False
+
+    def log_request(self, code='-', size='-'):
+        """Override BaseHTTPServer.log_request."""
+
+        self._logger.info('"%s" %s %s', self.requestline, str(code), str(size))
+
+    def log_error(self, *args):
+        """Override BaseHTTPServer.log_error."""
+
+        # Despite the name, this method is for warnings than for errors.
+        # For example, HTTP status code is logged by this method.
+        self._logger.warning('%s - %s', self.address_string(),
+                             args[0] % args[1:])
+
+    def is_cgi(self):
+        """Test whether self.path corresponds to a CGI script.
+
+        Add extra check that self.path doesn't contains ..
+        Also check if the file is a executable file or not.
+        If the file is not executable, it is handled as static file or dir
+        rather than a CGI script.
+        """
+
+        if CGIHTTPServer.CGIHTTPRequestHandler.is_cgi(self):
+            if '..' in self.path:
+                return False
+            # strip query parameter from request path
+            resource_name = self.path.split('?', 2)[0]
+            # convert resource_name into real path name in filesystem.
+            scriptfile = self.translate_path(resource_name)
+            if not os.path.isfile(scriptfile):
+                return False
+            if not self.is_executable(scriptfile):
+                return False
+            return True
+        return False
+
+
+# vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/server_util.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/server_util.py
new file mode 100644
index 00000000000..8f9e273e977
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/server_util.py
@@ -0,0 +1,87 @@
+# Copyright 2020, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+"""Server related utilities."""
+
+import logging
+import logging.handlers
+import threading
+import time
+
+from mod_pywebsocket import common
+from mod_pywebsocket import util
+
+
+def _get_logger_from_class(c):
+    return logging.getLogger('%s.%s' % (c.__module__, c.__name__))
+
+
+def configure_logging(options):
+    logging.addLevelName(common.LOGLEVEL_FINE, 'FINE')
+
+    logger = logging.getLogger()
+    logger.setLevel(logging.getLevelName(options.log_level.upper()))
+    if options.log_file:
+        handler = logging.handlers.RotatingFileHandler(options.log_file, 'a',
+                                                       options.log_max,
+                                                       options.log_count)
+    else:
+        handler = logging.StreamHandler()
+    formatter = logging.Formatter(
+        '[%(asctime)s] [%(levelname)s] %(name)s: %(message)s')
+    handler.setFormatter(formatter)
+    logger.addHandler(handler)
+
+    deflate_log_level_name = logging.getLevelName(
+        options.deflate_log_level.upper())
+    _get_logger_from_class(util._Deflater).setLevel(deflate_log_level_name)
+    _get_logger_from_class(util._Inflater).setLevel(deflate_log_level_name)
+
+
+class ThreadMonitor(threading.Thread):
+    daemon = True
+
+    def __init__(self, interval_in_sec):
+        threading.Thread.__init__(self, name='ThreadMonitor')
+
+        self._logger = util.get_class_logger(self)
+
+        self._interval_in_sec = interval_in_sec
+
+    def run(self):
+        while True:
+            thread_name_list = []
+            for thread in threading.enumerate():
+                thread_name_list.append(thread.name)
+            self._logger.info("%d active threads: %s",
+                              threading.active_count(),
+                              ', '.join(thread_name_list))
+            time.sleep(self._interval_in_sec)
+
+
+# vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/standalone.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/standalone.py
new file mode 100755
index 00000000000..1042c496c58
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/standalone.py
@@ -0,0 +1,478 @@
+#!/usr/bin/env python
+#
+# Copyright 2012, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+"""Standalone WebSocket server.
+
+Use this file to launch pywebsocket as a standalone server.
+
+
+BASIC USAGE
+===========
+
+Go to the src directory and run
+
+  $ python mod_pywebsocket/standalone.py [-p <ws_port>]
+                                         [-w <websock_handlers>]
+                                         [-d <document_root>]
+
+<ws_port> is the port number to use for ws:// connection.
+
+<document_root> is the path to the root directory of HTML files.
+
+<websock_handlers> is the path to the root directory of WebSocket handlers.
+If not specified, <document_root> will be used. See __init__.py (or
+run $ pydoc mod_pywebsocket) for how to write WebSocket handlers.
+
+For more detail and other options, run
+
+  $ python mod_pywebsocket/standalone.py --help
+
+or see _build_option_parser method below.
+
+For trouble shooting, adding "--log_level debug" might help you.
+
+
+TRY DEMO
+========
+
+Go to the src directory and run standalone.py with -d option to set the
+document root to the directory containing example HTMLs and handlers like this:
+
+  $ cd src
+  $ PYTHONPATH=. python mod_pywebsocket/standalone.py -d example
+
+to launch pywebsocket with the sample handler and html on port 80. Open
+http://localhost/console.html, click the connect button, type something into
+the text box next to the send button and click the send button. If everything
+is working, you'll see the message you typed echoed by the server.
+
+
+USING TLS
+=========
+
+To run the standalone server with TLS support, run it with -t, -k, and -c
+options. When TLS is enabled, the standalone server accepts only TLS connection.
+
+Note that when ssl module is used and the key/cert location is incorrect,
+TLS connection silently fails while pyOpenSSL fails on startup.
+
+Example:
+
+  $ PYTHONPATH=. python mod_pywebsocket/standalone.py \
+        -d example \
+        -p 10443 \
+        -t \
+        -c ../test/cert/cert.pem \
+        -k ../test/cert/key.pem \
+
+Note that when passing a relative path to -c and -k option, it will be resolved
+using the document root directory as the base.
+
+
+USING CLIENT AUTHENTICATION
+===========================
+
+To run the standalone server with TLS client authentication support, run it with
+--tls-client-auth and --tls-client-ca options in addition to ones required for
+TLS support.
+
+Example:
+
+  $ PYTHONPATH=. python mod_pywebsocket/standalone.py -d example -p 10443 -t \
+        -c ../test/cert/cert.pem -k ../test/cert/key.pem \
+        --tls-client-auth \
+        --tls-client-ca=../test/cert/cacert.pem
+
+Note that when passing a relative path to --tls-client-ca option, it will be
+resolved using the document root directory as the base.
+
+
+CONFIGURATION FILE
+==================
+
+You can also write a configuration file and use it by specifying the path to
+the configuration file by --config option. Please write a configuration file
+following the documentation of the Python ConfigParser library. Name of each
+entry must be the long version argument name. E.g. to set log level to debug,
+add the following line:
+
+log_level=debug
+
+For options which doesn't take value, please add some fake value. E.g. for
+--tls option, add the following line:
+
+tls=True
+
+Note that tls will be enabled even if you write tls=False as the value part is
+fake.
+
+When both a command line argument and a configuration file entry are set for
+the same configuration item, the command line value will override one in the
+configuration file.
+
+
+THREADING
+=========
+
+This server is derived from SocketServer.ThreadingMixIn. Hence a thread is
+used for each request.
+
+
+SECURITY WARNING
+================
+
+This uses CGIHTTPServer and CGIHTTPServer is not secure.
+It may execute arbitrary Python code or external programs. It should not be
+used outside a firewall.
+"""
+
+from __future__ import absolute_import
+from six.moves import configparser
+import base64
+import logging
+import optparse
+import os
+import sys
+import traceback
+
+from mod_pywebsocket import common
+from mod_pywebsocket import util
+from mod_pywebsocket import server_util
+from mod_pywebsocket.websocket_server import WebSocketServer
+
+_DEFAULT_LOG_MAX_BYTES = 1024 * 256
+_DEFAULT_LOG_BACKUP_COUNT = 5
+
+_DEFAULT_REQUEST_QUEUE_SIZE = 128
+
+
+def _build_option_parser():
+    parser = optparse.OptionParser()
+
+    parser.add_option('--config',
+                      dest='config_file',
+                      type='string',
+                      default=None,
+                      help=('Path to configuration file. See the file comment '
+                            'at the top of this file for the configuration '
+                            'file format'))
+    parser.add_option('-H',
+                      '--server-host',
+                      '--server_host',
+                      dest='server_host',
+                      default='',
+                      help='server hostname to listen to')
+    parser.add_option('-V',
+                      '--validation-host',
+                      '--validation_host',
+                      dest='validation_host',
+                      default=None,
+                      help='server hostname to validate in absolute path.')
+    parser.add_option('-p',
+                      '--port',
+                      dest='port',
+                      type='int',
+                      default=common.DEFAULT_WEB_SOCKET_PORT,
+                      help='port to listen to')
+    parser.add_option('-P',
+                      '--validation-port',
+                      '--validation_port',
+                      dest='validation_port',
+                      type='int',
+                      default=None,
+                      help='server port to validate in absolute path.')
+    parser.add_option('-w',
+                      '--websock-handlers',
+                      '--websock_handlers',
+                      dest='websock_handlers',
+                      default='.',
+                      help=('The root directory of WebSocket handler files. '
+                            'If the path is relative, --document-root is used '
+                            'as the base.'))
+    parser.add_option('-m',
+                      '--websock-handlers-map-file',
+                      '--websock_handlers_map_file',
+                      dest='websock_handlers_map_file',
+                      default=None,
+                      help=('WebSocket handlers map file. '
+                            'Each line consists of alias_resource_path and '
+                            'existing_resource_path, separated by spaces.'))
+    parser.add_option('-s',
+                      '--scan-dir',
+                      '--scan_dir',
+                      dest='scan_dir',
+                      default=None,
+                      help=('Must be a directory under --websock-handlers. '
+                            'Only handlers under this directory are scanned '
+                            'and registered to the server. '
+                            'Useful for saving scan time when the handler '
+                            'root directory contains lots of files that are '
+                            'not handler file or are handler files but you '
+                            'don\'t want them to be registered. '))
+    parser.add_option('--allow-handlers-outside-root-dir',
+                      '--allow_handlers_outside_root_dir',
+                      dest='allow_handlers_outside_root_dir',
+                      action='store_true',
+                      default=False,
+                      help=('Scans WebSocket handlers even if their canonical '
+                            'path is not under --websock-handlers.'))
+    parser.add_option('-d',
+                      '--document-root',
+                      '--document_root',
+                      dest='document_root',
+                      default='.',
+                      help='Document root directory.')
+    parser.add_option('-x',
+                      '--cgi-paths',
+                      '--cgi_paths',
+                      dest='cgi_paths',
+                      default=None,
+                      help=('CGI paths relative to document_root.'
+                            'Comma-separated. (e.g -x /cgi,/htbin) '
+                            'Files under document_root/cgi_path are handled '
+                            'as CGI programs. Must be executable.'))
+    parser.add_option('-t',
+                      '--tls',
+                      dest='use_tls',
+                      action='store_true',
+                      default=False,
+                      help='use TLS (wss://)')
+    parser.add_option('-k',
+                      '--private-key',
+                      '--private_key',
+                      dest='private_key',
+                      default='',
+                      help='TLS private key file.')
+    parser.add_option('-c',
+                      '--certificate',
+                      dest='certificate',
+                      default='',
+                      help='TLS certificate file.')
+    parser.add_option('--tls-client-auth',
+                      dest='tls_client_auth',
+                      action='store_true',
+                      default=False,
+                      help='Requests TLS client auth on every connection.')
+    parser.add_option('--tls-client-cert-optional',
+                      dest='tls_client_cert_optional',
+                      action='store_true',
+                      default=False,
+                      help=('Makes client certificate optional even though '
+                            'TLS client auth is enabled.'))
+    parser.add_option('--tls-client-ca',
+                      dest='tls_client_ca',
+                      default='',
+                      help=('Specifies a pem file which contains a set of '
+                            'concatenated CA certificates which are used to '
+                            'validate certificates passed from clients'))
+    parser.add_option('--basic-auth',
+                      dest='use_basic_auth',
+                      action='store_true',
+                      default=False,
+                      help='Requires Basic authentication.')
+    parser.add_option('--basic-auth-credential',
+                      dest='basic_auth_credential',
+                      default='test:test',
+                      help='Specifies the credential of basic authentication '
+                      'by username:password pair (e.g. test:test).')
+    parser.add_option('-l',
+                      '--log-file',
+                      '--log_file',
+                      dest='log_file',
+                      default='',
+                      help='Log file.')
+    # Custom log level:
+    # - FINE: Prints status of each frame processing step
+    parser.add_option('--log-level',
+                      '--log_level',
+                      type='choice',
+                      dest='log_level',
+                      default='warn',
+                      choices=[
+                          'fine', 'debug', 'info', 'warning', 'warn', 'error',
+                          'critical'
+                      ],
+                      help='Log level.')
+    parser.add_option(
+        '--deflate-log-level',
+        '--deflate_log_level',
+        type='choice',
+        dest='deflate_log_level',
+        default='warn',
+        choices=['debug', 'info', 'warning', 'warn', 'error', 'critical'],
+        help='Log level for _Deflater and _Inflater.')
+    parser.add_option('--thread-monitor-interval-in-sec',
+                      '--thread_monitor_interval_in_sec',
+                      dest='thread_monitor_interval_in_sec',
+                      type='int',
+                      default=-1,
+                      help=('If positive integer is specified, run a thread '
+                            'monitor to show the status of server threads '
+                            'periodically in the specified inteval in '
+                            'second. If non-positive integer is specified, '
+                            'disable the thread monitor.'))
+    parser.add_option('--log-max',
+                      '--log_max',
+                      dest='log_max',
+                      type='int',
+                      default=_DEFAULT_LOG_MAX_BYTES,
+                      help='Log maximum bytes')
+    parser.add_option('--log-count',
+                      '--log_count',
+                      dest='log_count',
+                      type='int',
+                      default=_DEFAULT_LOG_BACKUP_COUNT,
+                      help='Log backup count')
+    parser.add_option('-q',
+                      '--queue',
+                      dest='request_queue_size',
+                      type='int',
+                      default=_DEFAULT_REQUEST_QUEUE_SIZE,
+                      help='request queue size')
+
+    return parser
+
+
+def _parse_args_and_config(args):
+    parser = _build_option_parser()
+
+    # First, parse options without configuration file.
+    temporary_options, temporary_args = parser.parse_args(args=args)
+    if temporary_args:
+        logging.critical('Unrecognized positional arguments: %r',
+                         temporary_args)
+        sys.exit(1)
+
+    if temporary_options.config_file:
+        try:
+            config_fp = open(temporary_options.config_file, 'r')
+        except IOError as e:
+            logging.critical('Failed to open configuration file %r: %r',
+                             temporary_options.config_file, e)
+            sys.exit(1)
+
+        config_parser = configparser.SafeConfigParser()
+        config_parser.readfp(config_fp)
+        config_fp.close()
+
+        args_from_config = []
+        for name, value in config_parser.items('pywebsocket'):
+            args_from_config.append('--' + name)
+            args_from_config.append(value)
+        if args is None:
+            args = args_from_config
+        else:
+            args = args_from_config + args
+        return parser.parse_args(args=args)
+    else:
+        return temporary_options, temporary_args
+
+
+def _main(args=None):
+    """You can call this function from your own program, but please note that
+    this function has some side-effects that might affect your program. For
+    example, util.wrap_popen3_for_win use in this method replaces implementation
+    of os.popen3.
+    """
+
+    options, args = _parse_args_and_config(args=args)
+
+    os.chdir(options.document_root)
+
+    server_util.configure_logging(options)
+
+    # TODO(tyoshino): Clean up initialization of CGI related values. Move some
+    # of code here to WebSocketRequestHandler class if it's better.
+    options.cgi_directories = []
+    options.is_executable_method = None
+    if options.cgi_paths:
+        options.cgi_directories = options.cgi_paths.split(',')
+        if sys.platform in ('cygwin', 'win32'):
+            cygwin_path = None
+            # For Win32 Python, it is expected that CYGWIN_PATH
+            # is set to a directory of cygwin binaries.
+            # For example, websocket_server.py in Chromium sets CYGWIN_PATH to
+            # full path of third_party/cygwin/bin.
+            if 'CYGWIN_PATH' in os.environ:
+                cygwin_path = os.environ['CYGWIN_PATH']
+            util.wrap_popen3_for_win(cygwin_path)
+
+            def __check_script(scriptpath):
+                return util.get_script_interp(scriptpath, cygwin_path)
+
+            options.is_executable_method = __check_script
+
+    if options.use_tls:
+        logging.debug('Using ssl module')
+
+        if not options.private_key or not options.certificate:
+            logging.critical(
+                'To use TLS, specify private_key and certificate.')
+            sys.exit(1)
+
+        if (options.tls_client_cert_optional and not options.tls_client_auth):
+            logging.critical('Client authentication must be enabled to '
+                             'specify tls_client_cert_optional')
+            sys.exit(1)
+    else:
+        if options.tls_client_auth:
+            logging.critical('TLS must be enabled for client authentication.')
+            sys.exit(1)
+
+        if options.tls_client_cert_optional:
+            logging.critical('TLS must be enabled for client authentication.')
+            sys.exit(1)
+
+    if not options.scan_dir:
+        options.scan_dir = options.websock_handlers
+
+    if options.use_basic_auth:
+        options.basic_auth_credential = 'Basic ' + base64.b64encode(
+            options.basic_auth_credential.encode('UTF-8')).decode()
+
+    try:
+        if options.thread_monitor_interval_in_sec > 0:
+            # Run a thread monitor to show the status of server threads for
+            # debugging.
+            server_util.ThreadMonitor(
+                options.thread_monitor_interval_in_sec).start()
+
+        server = WebSocketServer(options)
+        server.serve_forever()
+    except Exception as e:
+        logging.critical('mod_pywebsocket: %s' % e)
+        logging.critical('mod_pywebsocket: %s' % traceback.format_exc())
+        sys.exit(1)
+
+
+if __name__ == '__main__':
+    _main(sys.argv[1:])
+
+# vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/_stream_hybi.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/stream.py
similarity index 76%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/_stream_hybi.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/stream.py
index 718e8ffa395..fc399f2a85b 100644
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/_stream_hybi.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/stream.py
@@ -1,4 +1,4 @@
-# Copyright 2012, Google Inc.
+# Copyright 2011, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -26,8 +26,6 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 """This file provides classes and helper functions for parsing/building frames
 of the WebSocket protocol (RFC 6455).
 
@@ -35,30 +33,33 @@ Specification:
 http://tools.ietf.org/html/rfc6455
 """
 
-
 from collections import deque
 import logging
 import os
 import struct
 import time
+import socket
+import six
 
 from mod_pywebsocket import common
 from mod_pywebsocket import util
-from mod_pywebsocket._stream_base import BadOperationException
-from mod_pywebsocket._stream_base import ConnectionTerminatedException
-from mod_pywebsocket._stream_base import InvalidFrameException
-from mod_pywebsocket._stream_base import InvalidUTF8Exception
-from mod_pywebsocket._stream_base import StreamBase
-from mod_pywebsocket._stream_base import UnsupportedFrameException
-
+from mod_pywebsocket._stream_exceptions import BadOperationException
+from mod_pywebsocket._stream_exceptions import ConnectionTerminatedException
+from mod_pywebsocket._stream_exceptions import InvalidFrameException
+from mod_pywebsocket._stream_exceptions import InvalidUTF8Exception
+from mod_pywebsocket._stream_exceptions import UnsupportedFrameException
 
 _NOOP_MASKER = util.NoopMasker()
 
 
 class Frame(object):
-
-    def __init__(self, fin=1, rsv1=0, rsv2=0, rsv3=0,
-                 opcode=None, payload=''):
+    def __init__(self,
+                 fin=1,
+                 rsv1=0,
+                 rsv2=0,
+                 rsv3=0,
+                 opcode=None,
+                 payload=b''):
         self.fin = fin
         self.rsv1 = rsv1
         self.rsv2 = rsv2
@@ -90,11 +91,11 @@ def create_length_header(length, mask):
     if length < 0:
         raise ValueError('length must be non negative integer')
     elif length <= 125:
-        return chr(mask_bit | length)
+        return util.pack_byte(mask_bit | length)
     elif length < (1 << 16):
-        return chr(mask_bit | 126) + struct.pack('!H', length)
+        return util.pack_byte(mask_bit | 126) + struct.pack('!H', length)
     elif length < (1 << 63):
-        return chr(mask_bit | 127) + struct.pack('!Q', length)
+        return util.pack_byte(mask_bit | 127) + struct.pack('!Q', length)
     else:
         raise ValueError('Payload is too big for one frame')
 
@@ -115,12 +116,12 @@ def create_header(opcode, payload_length, fin, rsv1, rsv2, rsv3, mask):
     if (fin | rsv1 | rsv2 | rsv3) & ~1:
         raise ValueError('FIN bit and Reserved bit parameter must be 0 or 1')
 
-    header = ''
+    header = b''
 
     first_byte = ((fin << 7)
                   | (rsv1 << 6) | (rsv2 << 5) | (rsv3 << 4)
                   | opcode)
-    header += chr(first_byte)
+    header += util.pack_byte(first_byte)
     header += create_length_header(payload_length, mask)
 
     return header
@@ -140,22 +141,27 @@ def _filter_and_format_frame_object(frame, mask, frame_filters):
     for frame_filter in frame_filters:
         frame_filter.filter(frame)
 
-    header = create_header(
-        frame.opcode, len(frame.payload), frame.fin,
-        frame.rsv1, frame.rsv2, frame.rsv3, mask)
+    header = create_header(frame.opcode, len(frame.payload), frame.fin,
+                           frame.rsv1, frame.rsv2, frame.rsv3, mask)
     return _build_frame(header, frame.payload, mask)
 
 
-def create_binary_frame(
-    message, opcode=common.OPCODE_BINARY, fin=1, mask=False, frame_filters=[]):
+def create_binary_frame(message,
+                        opcode=common.OPCODE_BINARY,
+                        fin=1,
+                        mask=False,
+                        frame_filters=[]):
     """Creates a simple binary frame with no extension, reserved bit."""
 
     frame = Frame(fin=fin, opcode=opcode, payload=message)
     return _filter_and_format_frame_object(frame, mask, frame_filters)
 
 
-def create_text_frame(
-    message, opcode=common.OPCODE_TEXT, fin=1, mask=False, frame_filters=[]):
+def create_text_frame(message,
+                      opcode=common.OPCODE_TEXT,
+                      fin=1,
+                      mask=False,
+                      frame_filters=[]):
     """Creates a simple text frame with no extension, reserved bit."""
 
     encoded_message = message.encode('utf-8')
@@ -163,7 +169,8 @@ def create_text_frame(
                                frame_filters)
 
 
-def parse_frame(receive_bytes, logger=None,
+def parse_frame(receive_bytes,
+                logger=None,
                 ws_version=common.VERSION_HYBI_LATEST,
                 unmask_receive=True):
     """Parses a frame. Returns a tuple containing each header field and
@@ -189,23 +196,21 @@ def parse_frame(receive_bytes, logger=None,
 
     logger.log(common.LOGLEVEL_FINE, 'Receive the first 2 octets of a frame')
 
-    received = receive_bytes(2)
-
-    first_byte = ord(received[0])
+    first_byte = ord(receive_bytes(1))
     fin = (first_byte >> 7) & 1
     rsv1 = (first_byte >> 6) & 1
     rsv2 = (first_byte >> 5) & 1
     rsv3 = (first_byte >> 4) & 1
     opcode = first_byte & 0xf
 
-    second_byte = ord(received[1])
+    second_byte = ord(receive_bytes(1))
     mask = (second_byte >> 7) & 1
     payload_length = second_byte & 0x7f
 
-    logger.log(common.LOGLEVEL_FINE,
-               'FIN=%s, RSV1=%s, RSV2=%s, RSV3=%s, opcode=%s, '
-               'Mask=%s, Payload_length=%s',
-               fin, rsv1, rsv2, rsv3, opcode, mask, payload_length)
+    logger.log(
+        common.LOGLEVEL_FINE, 'FIN=%s, RSV1=%s, RSV2=%s, RSV3=%s, opcode=%s, '
+        'Mask=%s, Payload_length=%s', fin, rsv1, rsv2, rsv3, opcode, mask,
+        payload_length)
 
     if (mask == 1) != unmask_receive:
         raise InvalidFrameException(
@@ -222,36 +227,32 @@ def parse_frame(receive_bytes, logger=None,
                    'Receive 8-octet extended payload length')
 
         extended_payload_length = receive_bytes(8)
-        payload_length = struct.unpack(
-            '!Q', extended_payload_length)[0]
+        payload_length = struct.unpack('!Q', extended_payload_length)[0]
         if payload_length > 0x7FFFFFFFFFFFFFFF:
-            raise InvalidFrameException(
-                'Extended payload length >= 2^63')
+            raise InvalidFrameException('Extended payload length >= 2^63')
         if ws_version >= 13 and payload_length < 0x10000:
             valid_length_encoding = False
             length_encoding_bytes = 8
 
-        logger.log(common.LOGLEVEL_FINE,
-                   'Decoded_payload_length=%s', payload_length)
+        logger.log(common.LOGLEVEL_FINE, 'Decoded_payload_length=%s',
+                   payload_length)
     elif payload_length == 126:
         logger.log(common.LOGLEVEL_FINE,
                    'Receive 2-octet extended payload length')
 
         extended_payload_length = receive_bytes(2)
-        payload_length = struct.unpack(
-            '!H', extended_payload_length)[0]
+        payload_length = struct.unpack('!H', extended_payload_length)[0]
         if ws_version >= 13 and payload_length < 126:
             valid_length_encoding = False
             length_encoding_bytes = 2
 
-        logger.log(common.LOGLEVEL_FINE,
-                   'Decoded_payload_length=%s', payload_length)
+        logger.log(common.LOGLEVEL_FINE, 'Decoded_payload_length=%s',
+                   payload_length)
 
     if not valid_length_encoding:
         logger.warning(
             'Payload length is not encoded using the minimal number of '
-            'bytes (%d is encoded using %d bytes)',
-            payload_length,
+            'bytes (%d is encoded using %d bytes)', payload_length,
             length_encoding_bytes)
 
     if mask == 1:
@@ -272,8 +273,7 @@ def parse_frame(receive_bytes, logger=None,
 
     if logger.isEnabledFor(common.LOGLEVEL_FINE):
         logger.log(
-            common.LOGLEVEL_FINE,
-            'Done receiving payload data at %s MB/s',
+            common.LOGLEVEL_FINE, 'Done receiving payload data at %s MB/s',
             payload_length / (time.time() - receive_start) / 1000 / 1000)
     logger.log(common.LOGLEVEL_FINE, 'Unmask payload data')
 
@@ -283,17 +283,15 @@ def parse_frame(receive_bytes, logger=None,
     unmasked_bytes = masker.mask(raw_payload_bytes)
 
     if logger.isEnabledFor(common.LOGLEVEL_FINE):
-        logger.log(
-            common.LOGLEVEL_FINE,
-            'Done unmasking payload data at %s MB/s',
-            payload_length / (time.time() - unmask_start) / 1000 / 1000)
+        logger.log(common.LOGLEVEL_FINE,
+                   'Done unmasking payload data at %s MB/s',
+                   payload_length / (time.time() - unmask_start) / 1000 / 1000)
 
     return opcode, unmasked_bytes, fin, rsv1, rsv2, rsv3
 
 
 class FragmentedFrameBuilder(object):
     """A stateful class to send a message as fragments."""
-
     def __init__(self, mask, frame_filters=[], encode_utf8=True):
         """Constructs an instance."""
 
@@ -331,11 +329,11 @@ class FragmentedFrameBuilder(object):
             fin = 0
 
         if binary or not self._encode_utf8:
-            return create_binary_frame(
-                payload_data, opcode, fin, self._mask, self._frame_filters)
+            return create_binary_frame(payload_data, opcode, fin, self._mask,
+                                       self._frame_filters)
         else:
-            return create_text_frame(
-                payload_data, opcode, fin, self._mask, self._frame_filters)
+            return create_text_frame(payload_data, opcode, fin, self._mask,
+                                     self._frame_filters)
 
 
 def _create_control_frame(opcode, body, mask, frame_filters):
@@ -348,9 +346,8 @@ def _create_control_frame(opcode, body, mask, frame_filters):
         raise BadOperationException(
             'Payload data size of control frames must be 125 bytes or less')
 
-    header = create_header(
-        frame.opcode, len(frame.payload), frame.fin,
-        frame.rsv1, frame.rsv2, frame.rsv3, mask)
+    header = create_header(frame.opcode, len(frame.payload), frame.fin,
+                           frame.rsv1, frame.rsv2, frame.rsv3, mask)
     return _build_frame(header, frame.payload, mask)
 
 
@@ -363,21 +360,21 @@ def create_pong_frame(body, mask=False, frame_filters=[]):
 
 
 def create_close_frame(body, mask=False, frame_filters=[]):
-    return _create_control_frame(
-        common.OPCODE_CLOSE, body, mask, frame_filters)
+    return _create_control_frame(common.OPCODE_CLOSE, body, mask,
+                                 frame_filters)
 
 
 def create_closing_handshake_body(code, reason):
-    body = ''
+    body = b''
     if code is not None:
-        if (code > common.STATUS_USER_PRIVATE_MAX or
-            code < common.STATUS_NORMAL_CLOSURE):
+        if (code > common.STATUS_USER_PRIVATE_MAX
+                or code < common.STATUS_NORMAL_CLOSURE):
             raise BadOperationException('Status code is out of range')
-        if (code == common.STATUS_NO_STATUS_RECEIVED or
-            code == common.STATUS_ABNORMAL_CLOSURE or
-            code == common.STATUS_TLS_HANDSHAKE):
+        if (code == common.STATUS_NO_STATUS_RECEIVED
+                or code == common.STATUS_ABNORMAL_CLOSURE
+                or code == common.STATUS_TLS_HANDSHAKE):
             raise BadOperationException('Status code is reserved pseudo '
-                'code')
+                                        'code')
         encoded_reason = reason.encode('utf-8')
         body = struct.pack('!H', code) + encoded_reason
     return body
@@ -385,7 +382,6 @@ def create_closing_handshake_body(code, reason):
 
 class StreamOptions(object):
     """Holds option values to configure Stream objects."""
-
     def __init__(self):
         """Constructs StreamOptions."""
 
@@ -402,11 +398,10 @@ class StreamOptions(object):
         self.unmask_receive = True
 
 
-class Stream(StreamBase):
+class Stream(object):
     """A class for parsing/building frames of the WebSocket protocol
     (RFC 6455).
     """
-
     def __init__(self, request, options):
         """Constructs an instance.
 
@@ -414,11 +409,10 @@ class Stream(StreamBase):
             request: mod_python request.
         """
 
-        StreamBase.__init__(self, request)
-
         self._logger = util.get_class_logger(self)
 
         self._options = options
+        self._request = request
 
         self._request.client_terminated = False
         self._request.server_terminated = False
@@ -434,6 +428,71 @@ class Stream(StreamBase):
 
         self._ping_queue = deque()
 
+    def _read(self, length):
+        """Reads length bytes from connection. In case we catch any exception,
+        prepends remote address to the exception message and raise again.
+
+        Raises:
+            ConnectionTerminatedException: when read returns empty string.
+        """
+
+        try:
+            read_bytes = self._request.connection.read(length)
+            if not read_bytes:
+                raise ConnectionTerminatedException(
+                    'Receiving %d byte failed. Peer (%r) closed connection' %
+                    (length, (self._request.connection.remote_addr, )))
+            return read_bytes
+        except IOError as e:
+            # Also catch an IOError because mod_python throws it.
+            raise ConnectionTerminatedException(
+                'Receiving %d byte failed. IOError (%s) occurred' %
+                (length, e))
+
+    def _write(self, bytes_to_write):
+        """Writes given bytes to connection. In case we catch any exception,
+        prepends remote address to the exception message and raise again.
+        """
+
+        try:
+            self._request.connection.write(bytes_to_write)
+        except Exception as e:
+            util.prepend_message_to_exception(
+                'Failed to send message to %r: ' %
+                (self._request.connection.remote_addr, ), e)
+            raise
+
+    def receive_bytes(self, length):
+        """Receives multiple bytes. Retries read when we couldn't receive the
+        specified amount. This method returns byte strings.
+
+        Raises:
+            ConnectionTerminatedException: when read returns empty string.
+        """
+
+        read_bytes = []
+        while length > 0:
+            new_read_bytes = self._read(length)
+            read_bytes.append(new_read_bytes)
+            length -= len(new_read_bytes)
+        return b''.join(read_bytes)
+
+    def _read_until(self, delim_char):
+        """Reads bytes until we encounter delim_char. The result will not
+        contain delim_char.
+
+        Raises:
+            ConnectionTerminatedException: when read returns empty string.
+        """
+
+        read_bytes = []
+        while True:
+            ch = self._read(1)
+            if ch == delim_char:
+                break
+            read_bytes.append(ch)
+        return b''.join(read_bytes)
+
     def _receive_frame(self):
         """Receives a frame and return data in the frame as a tuple containing
         each header field and payload separately.
@@ -443,7 +502,6 @@ class Stream(StreamBase):
                 string.
             InvalidFrameException: when the frame contains invalid data.
         """
-
         def _receive_bytes(length):
             return self.receive_bytes(length)
 
@@ -455,8 +513,12 @@ class Stream(StreamBase):
     def _receive_frame_as_frame_object(self):
         opcode, unmasked_bytes, fin, rsv1, rsv2, rsv3 = self._receive_frame()
 
-        return Frame(fin=fin, rsv1=rsv1, rsv2=rsv2, rsv3=rsv3,
-                     opcode=opcode, payload=unmasked_bytes)
+        return Frame(fin=fin,
+                     rsv1=rsv1,
+                     rsv2=rsv2,
+                     rsv3=rsv3,
+                     opcode=opcode,
+                     payload=unmasked_bytes)
 
     def receive_filtered_frame(self):
         """Receives a frame and applies frame filters and message filters.
@@ -472,8 +534,8 @@ class Stream(StreamBase):
             raise InvalidFrameException(
                 'Segmented frames must not be received via '
                 'receive_filtered_frame()')
-        if (frame.opcode != common.OPCODE_TEXT and
-            frame.opcode != common.OPCODE_BINARY):
+        if (frame.opcode != common.OPCODE_TEXT
+                and frame.opcode != common.OPCODE_BINARY):
             raise InvalidFrameException(
                 'Control frames must not be received via '
                 'receive_filtered_frame()')
@@ -501,9 +563,9 @@ class Stream(StreamBase):
             raise BadOperationException(
                 'Requested send_message after sending out a closing handshake')
 
-        if binary and isinstance(message, unicode):
+        if binary and isinstance(message, six.text_type):
             raise BadOperationException(
-                'Message for binary frame must be instance of str')
+                'Message for binary frame must not be instance of Unicode')
 
         for message_filter in self._options.outgoing_message_filters:
             message = message_filter.filter(message, end, binary)
@@ -521,15 +583,14 @@ class Stream(StreamBase):
             while True:
                 end_for_this_frame = end
                 bytes_to_write = len(message) - bytes_written
-                if (MAX_PAYLOAD_DATA_SIZE > 0 and
-                    bytes_to_write > MAX_PAYLOAD_DATA_SIZE):
+                if (MAX_PAYLOAD_DATA_SIZE > 0
+                        and bytes_to_write > MAX_PAYLOAD_DATA_SIZE):
                     end_for_this_frame = False
                     bytes_to_write = MAX_PAYLOAD_DATA_SIZE
 
                 frame = self._writer.build(
                     message[bytes_written:bytes_written + bytes_to_write],
-                    end_for_this_frame,
-                    binary)
+                    end_for_this_frame, binary)
                 self._write(frame)
 
                 bytes_written += bytes_to_write
@@ -566,7 +627,7 @@ class Stream(StreamBase):
             if frame.fin:
                 # End of fragmentation frame
                 self._received_fragments.append(frame.payload)
-                message = ''.join(self._received_fragments)
+                message = b''.join(self._received_fragments)
                 self._received_fragments = []
                 return message
             else:
@@ -620,21 +681,18 @@ class Stream(StreamBase):
         # - 3 or more octet of application data: both code and reason
         if len(message) == 0:
             self._logger.debug('Received close frame (empty body)')
-            self._request.ws_close_code = (
-                common.STATUS_NO_STATUS_RECEIVED)
+            self._request.ws_close_code = common.STATUS_NO_STATUS_RECEIVED
         elif len(message) == 1:
             raise InvalidFrameException(
                 'If a close frame has status code, the length of '
                 'status code must be 2 octet')
         elif len(message) >= 2:
-            self._request.ws_close_code = struct.unpack(
-                '!H', message[0:2])[0]
+            self._request.ws_close_code = struct.unpack('!H', message[0:2])[0]
             self._request.ws_close_reason = message[2:].decode(
                 'utf-8', 'replace')
-            self._logger.debug(
-                'Received close frame (code=%d, reason=%r)',
-                self._request.ws_close_code,
-                self._request.ws_close_reason)
+            self._logger.debug('Received close frame (code=%d, reason=%r)',
+                               self._request.ws_close_code,
+                               self._request.ws_close_reason)
 
         # As we've received a close frame, no more data is coming over the
         # socket. We can now safely close the socket without worrying about
@@ -645,15 +703,13 @@ class Stream(StreamBase):
                 'Received ack for server-initiated closing handshake')
             return
 
-        self._logger.debug(
-            'Received client-initiated closing handshake')
+        self._logger.debug('Received client-initiated closing handshake')
 
         code = common.STATUS_NORMAL_CLOSURE
         reason = ''
         if hasattr(self._request, '_dispatcher'):
             dispatcher = self._request._dispatcher
-            code, reason = dispatcher.passive_closing_handshake(
-                self._request)
+            code, reason = dispatcher.passive_closing_handshake(self._request)
             if code is None and reason is not None and len(reason) > 0:
                 self._logger.warning(
                     'Handler specified reason despite code being None')
@@ -677,7 +733,7 @@ class Stream(StreamBase):
             if handler:
                 handler(self._request, message)
                 return
-        except AttributeError as e:
+        except AttributeError:
             pass
         self._send_pong(message)
 
@@ -704,7 +760,7 @@ class Stream(StreamBase):
                     break
                 else:
                     inflight_pings.append(expected_body)
-            except IndexError as e:
+            except IndexError:
                 # The received pong was unsolicited pong. Keep the
                 # ping queue as is.
                 self._ping_queue = inflight_pings
@@ -715,7 +771,7 @@ class Stream(StreamBase):
             handler = self._request.on_pong_handler
             if handler:
                 handler(self._request, message)
-        except AttributeError as e:
+        except AttributeError:
             pass
 
     def receive_message(self):
@@ -746,15 +802,14 @@ class Stream(StreamBase):
 
         while True:
             # mp_conn.read will block if no bytes are available.
-            # Timeout is controlled by TimeOut directive of Apache.
 
             frame = self._receive_frame_as_frame_object()
 
             # Check the constraint on the payload size for control frames
             # before extension processes the frame.
             # See also http://tools.ietf.org/html/rfc6455#section-5.5
-            if (common.is_control_opcode(frame.opcode) and
-                len(frame.payload) > 125):
+            if (common.is_control_opcode(frame.opcode)
+                    and len(frame.payload) > 125):
                 raise InvalidFrameException(
                     'Payload data size of control frames must be 125 bytes or '
                     'less')
@@ -792,20 +847,23 @@ class Stream(StreamBase):
             elif self._original_opcode == common.OPCODE_PONG:
                 self._process_pong_message(message)
             else:
-                raise UnsupportedFrameException(
-                    'Opcode %d is not supported' % self._original_opcode)
+                raise UnsupportedFrameException('Opcode %d is not supported' %
+                                                self._original_opcode)
 
     def _send_closing_handshake(self, code, reason):
         body = create_closing_handshake_body(code, reason)
         frame = create_close_frame(
-            body, mask=self._options.mask_send,
+            body,
+            mask=self._options.mask_send,
             frame_filters=self._options.outgoing_frame_filters)
 
         self._request.server_terminated = True
 
         self._write(frame)
 
-    def close_connection(self, code=common.STATUS_NORMAL_CLOSURE, reason='',
+    def close_connection(self,
+                         code=common.STATUS_NORMAL_CLOSURE,
+                         reason='',
                          wait_response=True):
         """Closes a WebSocket connection. Note that this method blocks until
         it receives acknowledgement to the closing handshake.
@@ -837,17 +895,17 @@ class Stream(StreamBase):
                     'close reason must not be specified if code is None')
             reason = ''
         else:
-            if not isinstance(reason, str) and not isinstance(reason, unicode):
+            if not isinstance(reason, bytes) and not isinstance(
+                    reason, six.text_type):
                 raise BadOperationException(
-                    'close reason must be an instance of str or unicode')
+                    'close reason must be an instance of bytes or unicode')
 
         self._send_closing_handshake(code, reason)
-        self._logger.debug(
-            'Initiated closing handshake (code=%r, reason=%r)',
-            code, reason)
+        self._logger.debug('Initiated closing handshake (code=%r, reason=%r)',
+                           code, reason)
 
-        if (code == common.STATUS_GOING_AWAY or
-            code == common.STATUS_PROTOCOL_ERROR) or not wait_response:
+        if (code == common.STATUS_GOING_AWAY
+                or code == common.STATUS_PROTOCOL_ERROR) or not wait_response:
             # It doesn't make sense to wait for a close frame if the reason is
             # protocol error or that the server is going away. For some of
             # other reasons, it might not make sense to wait for a close frame,
@@ -866,20 +924,18 @@ class Stream(StreamBase):
         # TODO: 3. close the WebSocket connection.
         # note: mod_python Connection (mp_conn) doesn't have close method.
 
-    def send_ping(self, body=''):
-        frame = create_ping_frame(
-            body,
-            self._options.mask_send,
-            self._options.outgoing_frame_filters)
+    def send_ping(self, body, binary=False):
+        if not binary and isinstance(body, six.text_type):
+            body = body.encode('UTF-8')
+        frame = create_ping_frame(body, self._options.mask_send,
+                                  self._options.outgoing_frame_filters)
         self._write(frame)
 
         self._ping_queue.append(body)
 
     def _send_pong(self, body):
-        frame = create_pong_frame(
-            body,
-            self._options.mask_send,
-            self._options.outgoing_frame_filters)
+        frame = create_pong_frame(body, self._options.mask_send,
+                                  self._options.outgoing_frame_filters)
         self._write(frame)
 
     def get_last_received_opcode(self):
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/util.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/util.py
similarity index 83%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/util.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/util.py
index 6c8284cd074..e164e6b8e46 100644
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/mod_pywebsocket/util.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/util.py
@@ -26,33 +26,19 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 """WebSocket utilities."""
 
-
+from __future__ import absolute_import
 import array
 import errno
-
-# Import hash classes from a module available and recommended for each Python
-# version and re-export those symbol. Use sha and md5 module in Python 2.4, and
-# hashlib module in Python 2.6.
-try:
-    import hashlib
-    md5_hash = hashlib.md5
-    sha1_hash = hashlib.sha1
-except ImportError:
-    import md5
-    import sha
-    md5_hash = md5.md5
-    sha1_hash = sha.sha
-
-from six.moves import StringIO
 import logging
 import os
 import re
+import six
+from six.moves import map
+from six.moves import range
 import socket
-import traceback
+import struct
 import zlib
 
 try:
@@ -61,21 +47,9 @@ except ImportError:
     pass
 
 
-def get_stack_trace():
-    """Get the current stack trace as string.
-
-    This is needed to support Python 2.3.
-    TODO: Remove this when we only support Python 2.4 and above.
-          Use traceback.format_exc instead.
-    """
-    out = StringIO()
-    traceback.print_exc(file=out)
-    return out.getvalue()
-
-
 def prepend_message_to_exception(message, exc):
     """Prepend message to the exception."""
-    exc.args = (message + str(exc),)
+    exc.args = (message + str(exc), )
     return
 
 
@@ -143,13 +117,18 @@ def wrap_popen3_for_win(cygwin_path):
 
 
 def hexify(s):
-    return ' '.join(map(lambda x: '%02x' % ord(x), s))
+    return ' '.join(['%02x' % x for x in six.iterbytes(s)])
 
 
 def get_class_logger(o):
     """Return the logging class information."""
-    return logging.getLogger(
-        '%s.%s' % (o.__class__.__module__, o.__class__.__name__))
+    return logging.getLogger('%s.%s' %
+                             (o.__class__.__module__, o.__class__.__name__))
+
+
+def pack_byte(b):
+    """Pack an integer to network-ordered byte"""
+    return struct.pack('!B', b)
 
 
 class NoopMasker(object):
@@ -158,7 +137,6 @@ class NoopMasker(object):
     This has the same interface as RepeatedXorMasker but just returns
     the string passed in without making any change.
     """
-
     def __init__(self):
         """NoOp."""
         pass
@@ -169,45 +147,46 @@ class NoopMasker(object):
 
 
 class RepeatedXorMasker(object):
-
     """A masking object that applies XOR on the string.
 
-    Applies XOR on the string given to mask method with the masking bytes
+    Applies XOR on the byte string given to mask method with the masking bytes
     given to the constructor repeatedly. This object remembers the position
     in the masking bytes the last mask method call ended and resumes from
     that point on the next mask method call.
     """
-
     def __init__(self, masking_key):
         self._masking_key = masking_key
         self._masking_key_index = 0
 
     def _mask_using_swig(self, s):
         """Perform the mask via SWIG."""
-        masked_data = fast_masking.mask(
-                s, self._masking_key, self._masking_key_index)
-        self._masking_key_index = (
-                (self._masking_key_index + len(s)) % len(self._masking_key))
+        masked_data = fast_masking.mask(s, self._masking_key,
+                                        self._masking_key_index)
+        self._masking_key_index = ((self._masking_key_index + len(s)) %
+                                   len(self._masking_key))
         return masked_data
 
     def _mask_using_array(self, s):
         """Perform the mask via python."""
-        result = array.array('B')
-        result.fromstring(s)
+        if isinstance(s, six.text_type):
+            raise Exception(
+                'Masking Operation should not process unicode strings')
+
+        result = bytearray(s)
 
         # Use temporary local variables to eliminate the cost to access
         # attributes
-        masking_key = map(ord, self._masking_key)
+        masking_key = [c for c in six.iterbytes(self._masking_key)]
         masking_key_size = len(masking_key)
         masking_key_index = self._masking_key_index
 
-        for i in xrange(len(result)):
+        for i in range(len(result)):
             result[i] ^= masking_key[masking_key_index]
             masking_key_index = (masking_key_index + 1) % masking_key_size
 
         self._masking_key_index = masking_key_index
 
-        return result.tostring()
+        return bytes(result)
 
     if 'fast_masking' in globals():
         mask = _mask_using_swig
@@ -230,12 +209,24 @@ class RepeatedXorMasker(object):
 
 
 class _Deflater(object):
-
     def __init__(self, window_bits):
         self._logger = get_class_logger(self)
 
-        self._compress = zlib.compressobj(
-            zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED, -window_bits)
+        # Using the smallest window bits of 9 for generating input frames.
+        # On WebSocket spec, the smallest window bit is 8. However, zlib does
+        # not accept window_bit = 8.
+        #
+        # Because of a zlib deflate quirk, back-references will not use the
+        # entire range of 1 << window_bits, but will instead use a restricted
+        # range of (1 << window_bits) - 262. With an increased window_bits = 9,
+        # back-references will be within a range of 250. These can still be
+        # decompressed with window_bits = 8 and the 256-byte window used there.
+        #
+        # Similar disscussions can be found in https://crbug.com/691074
+        window_bits = max(window_bits, 9)
+
+        self._compress = zlib.compressobj(zlib.Z_DEFAULT_COMPRESSION,
+                                          zlib.DEFLATED, -window_bits)
 
     def compress(self, bytes):
         compressed_bytes = self._compress.compress(bytes)
@@ -259,12 +250,11 @@ class _Deflater(object):
 
 
 class _Inflater(object):
-
     def __init__(self, window_bits):
         self._logger = get_class_logger(self)
         self._window_bits = window_bits
 
-        self._unconsumed = ''
+        self._unconsumed = b''
 
         self.reset()
 
@@ -272,19 +262,12 @@ class _Inflater(object):
         if not (size == -1 or size > 0):
             raise Exception('size must be -1 or positive')
 
-        data = ''
+        data = b''
 
         while True:
-            if size == -1:
-                data += self._decompress.decompress(self._unconsumed)
-                # See Python bug http://bugs.python.org/issue12050 to
-                # understand why the same code cannot be used for updating
-                # self._unconsumed for here and else block.
-                self._unconsumed = ''
-            else:
-                data += self._decompress.decompress(
-                    self._unconsumed, size - len(data))
-                self._unconsumed = self._decompress.unconsumed_tail
+            data += self._decompress.decompress(self._unconsumed,
+                                                max(0, size - len(data)))
+            self._unconsumed = self._decompress.unconsumed_tail
             if self._decompress.unused_data:
                 # Encountered a last block (i.e. a block with BFINAL = 1) and
                 # found a new stream (unused_data). We cannot use the same
@@ -329,7 +312,6 @@ class _RFC1979Deflater(object):
     """A compressor class that applies DEFLATE to given byte sequence and
     flushes using the algorithm described in the RFC1979 section 2.1.
     """
-
     def __init__(self, window_bits, no_context_takeover):
         self._deflater = None
         if window_bits is None:
@@ -344,7 +326,7 @@ class _RFC1979Deflater(object):
         if bfinal:
             result = self._deflater.compress_and_finish(bytes)
             # Add a padding block with BFINAL = 0 and BTYPE = 0.
-            result = result + chr(0)
+            result = result + pack_byte(0)
             self._deflater = None
             return result
 
@@ -366,14 +348,13 @@ class _RFC1979Inflater(object):
     A decompressor class for byte sequence compressed and flushed following
     the algorithm described in the RFC1979 section 2.1.
     """
-
     def __init__(self, window_bits=zlib.MAX_WBITS):
         self._inflater = _Inflater(window_bits)
 
     def filter(self, bytes):
         # Restore stripped LEN and NLEN field of a non-compressed block added
         # for Z_SYNC_FLUSH.
-        self._inflater.append(bytes + '\x00\x00\xff\xff')
+        self._inflater.append(bytes + b'\x00\x00\xff\xff')
         return self._inflater.decompress(-1)
 
 
@@ -410,7 +391,7 @@ class DeflateSocket(object):
 
             read_data = self._socket.recv(DeflateSocket._RECV_SIZE)
             if not read_data:
-                return ''
+                return b''
             self._inflater.append(read_data)
 
     def sendall(self, bytes):
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/websocket_server.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/websocket_server.py
new file mode 100644
index 00000000000..df8cd393c7e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/websocket_server.py
@@ -0,0 +1,285 @@
+# Copyright 2020, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+"""Standalone WebsocketServer
+
+This file deals with the main module of standalone server. Although it is fine
+to import this file directly to use WebSocketServer, it is strongly recommended
+to use standalone.py, since it is intended to act as a skeleton of this module.
+"""
+
+from __future__ import absolute_import
+from six.moves import BaseHTTPServer
+from six.moves import socketserver
+import logging
+import re
+import select
+import socket
+import ssl
+import threading
+import traceback
+
+from mod_pywebsocket import dispatch
+from mod_pywebsocket import util
+from mod_pywebsocket.request_handler import WebSocketRequestHandler
+
+
+def _alias_handlers(dispatcher, websock_handlers_map_file):
+    """Set aliases specified in websock_handler_map_file in dispatcher.
+
+    Args:
+        dispatcher: dispatch.Dispatcher instance
+        websock_handler_map_file: alias map file
+    """
+
+    with open(websock_handlers_map_file) as f:
+        for line in f:
+            if line[0] == '#' or line.isspace():
+                continue
+            m = re.match('(\S+)\s+(\S+)$', line)
+            if not m:
+                logging.warning('Wrong format in map file:' + line)
+                continue
+            try:
+                dispatcher.add_resource_path_alias(m.group(1), m.group(2))
+            except dispatch.DispatchException as e:
+                logging.error(str(e))
+
+
+class WebSocketServer(socketserver.ThreadingMixIn, BaseHTTPServer.HTTPServer):
+    """HTTPServer specialized for WebSocket."""
+
+    # Overrides SocketServer.ThreadingMixIn.daemon_threads
+    daemon_threads = True
+    # Overrides BaseHTTPServer.HTTPServer.allow_reuse_address
+    allow_reuse_address = True
+
+    def __init__(self, options):
+        """Override SocketServer.TCPServer.__init__ to set SSL enabled
+        socket object to self.socket before server_bind and server_activate,
+        if necessary.
+        """
+
+        # Share a Dispatcher among request handlers to save time for
+        # instantiation.  Dispatcher can be shared because it is thread-safe.
+        options.dispatcher = dispatch.Dispatcher(
+            options.websock_handlers, options.scan_dir,
+            options.allow_handlers_outside_root_dir)
+        if options.websock_handlers_map_file:
+            _alias_handlers(options.dispatcher,
+                            options.websock_handlers_map_file)
+        warnings = options.dispatcher.source_warnings()
+        if warnings:
+            for warning in warnings:
+                logging.warning('Warning in source loading: %s' % warning)
+
+        self._logger = util.get_class_logger(self)
+
+        self.request_queue_size = options.request_queue_size
+        self.__ws_is_shut_down = threading.Event()
+        self.__ws_serving = False
+
+        socketserver.BaseServer.__init__(self,
+                                         (options.server_host, options.port),
+                                         WebSocketRequestHandler)
+
+        # Expose the options object to allow handler objects access it. We name
+        # it with websocket_ prefix to avoid conflict.
+        self.websocket_server_options = options
+
+        self._create_sockets()
+        self.server_bind()
+        self.server_activate()
+
+    def _create_sockets(self):
+        self.server_name, self.server_port = self.server_address
+        self._sockets = []
+        if not self.server_name:
+            # On platforms that doesn't support IPv6, the first bind fails.
+            # On platforms that supports IPv6
+            # - If it binds both IPv4 and IPv6 on call with AF_INET6, the
+            #   first bind succeeds and the second fails (we'll see 'Address
+            #   already in use' error).
+            # - If it binds only IPv6 on call with AF_INET6, both call are
+            #   expected to succeed to listen both protocol.
+            addrinfo_array = [(socket.AF_INET6, socket.SOCK_STREAM, '', '',
+                               ''),
+                              (socket.AF_INET, socket.SOCK_STREAM, '', '', '')]
+        else:
+            addrinfo_array = socket.getaddrinfo(self.server_name,
+                                                self.server_port,
+                                                socket.AF_UNSPEC,
+                                                socket.SOCK_STREAM,
+                                                socket.IPPROTO_TCP)
+        for addrinfo in addrinfo_array:
+            self._logger.info('Create socket on: %r', addrinfo)
+            family, socktype, proto, canonname, sockaddr = addrinfo
+            try:
+                socket_ = socket.socket(family, socktype)
+            except Exception as e:
+                self._logger.info('Skip by failure: %r', e)
+                continue
+            server_options = self.websocket_server_options
+            if server_options.use_tls:
+                if server_options.tls_client_auth:
+                    if server_options.tls_client_cert_optional:
+                        client_cert_ = ssl.CERT_OPTIONAL
+                    else:
+                        client_cert_ = ssl.CERT_REQUIRED
+                else:
+                    client_cert_ = ssl.CERT_NONE
+                socket_ = ssl.wrap_socket(
+                    socket_,
+                    keyfile=server_options.private_key,
+                    certfile=server_options.certificate,
+                    ca_certs=server_options.tls_client_ca,
+                    cert_reqs=client_cert_)
+            self._sockets.append((socket_, addrinfo))
+
+    def server_bind(self):
+        """Override SocketServer.TCPServer.server_bind to enable multiple
+        sockets bind.
+        """
+
+        failed_sockets = []
+
+        for socketinfo in self._sockets:
+            socket_, addrinfo = socketinfo
+            self._logger.info('Bind on: %r', addrinfo)
+            if self.allow_reuse_address:
+                socket_.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+            try:
+                socket_.bind(self.server_address)
+            except Exception as e:
+                self._logger.info('Skip by failure: %r', e)
+                socket_.close()
+                failed_sockets.append(socketinfo)
+            if self.server_address[1] == 0:
+                # The operating system assigns the actual port number for port
+                # number 0. This case, the second and later sockets should use
+                # the same port number. Also self.server_port is rewritten
+                # because it is exported, and will be used by external code.
+                self.server_address = (self.server_name,
+                                       socket_.getsockname()[1])
+                self.server_port = self.server_address[1]
+                self._logger.info('Port %r is assigned', self.server_port)
+
+        for socketinfo in failed_sockets:
+            self._sockets.remove(socketinfo)
+
+    def server_activate(self):
+        """Override SocketServer.TCPServer.server_activate to enable multiple
+        sockets listen.
+        """
+
+        failed_sockets = []
+
+        for socketinfo in self._sockets:
+            socket_, addrinfo = socketinfo
+            self._logger.info('Listen on: %r', addrinfo)
+            try:
+                socket_.listen(self.request_queue_size)
+            except Exception as e:
+                self._logger.info('Skip by failure: %r', e)
+                socket_.close()
+                failed_sockets.append(socketinfo)
+
+        for socketinfo in failed_sockets:
+            self._sockets.remove(socketinfo)
+
+        if len(self._sockets) == 0:
+            self._logger.critical(
+                'No sockets activated. Use info log level to see the reason.')
+
+    def server_close(self):
+        """Override SocketServer.TCPServer.server_close to enable multiple
+        sockets close.
+        """
+
+        for socketinfo in self._sockets:
+            socket_, addrinfo = socketinfo
+            self._logger.info('Close on: %r', addrinfo)
+            socket_.close()
+
+    def fileno(self):
+        """Override SocketServer.TCPServer.fileno."""
+
+        self._logger.critical('Not supported: fileno')
+        return self._sockets[0][0].fileno()
+
+    def handle_error(self, request, client_address):
+        """Override SocketServer.handle_error."""
+
+        self._logger.error('Exception in processing request from: %r\n%s',
+                           client_address, traceback.format_exc())
+        # Note: client_address is a tuple.
+
+    def get_request(self):
+        """Override TCPServer.get_request."""
+
+        accepted_socket, client_address = self.socket.accept()
+
+        server_options = self.websocket_server_options
+        if server_options.use_tls:
+            # Print cipher in use. Handshake is done on accept.
+            self._logger.debug('Cipher: %s', accepted_socket.cipher())
+            self._logger.debug('Client cert: %r',
+                               accepted_socket.getpeercert())
+
+        return accepted_socket, client_address
+
+    def serve_forever(self, poll_interval=0.5):
+        """Override SocketServer.BaseServer.serve_forever."""
+
+        self.__ws_serving = True
+        self.__ws_is_shut_down.clear()
+        handle_request = self.handle_request
+        if hasattr(self, '_handle_request_noblock'):
+            handle_request = self._handle_request_noblock
+        else:
+            self._logger.warning('Fallback to blocking request handler')
+        try:
+            while self.__ws_serving:
+                r, w, e = select.select(
+                    [socket_[0] for socket_ in self._sockets], [], [],
+                    poll_interval)
+                for socket_ in r:
+                    self.socket = socket_
+                    handle_request()
+                self.socket = None
+        finally:
+            self.__ws_is_shut_down.set()
+
+    def shutdown(self):
+        """Override SocketServer.BaseServer.shutdown."""
+
+        self.__ws_serving = False
+        self.__ws_is_shut_down.wait()
+
+
+# vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/setup.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/setup.py
similarity index 62%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/setup.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/setup.py
index 935d6b10589..57e9428d691 100755
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/setup.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/setup.py
@@ -28,47 +28,47 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 """Set up script for mod_pywebsocket.
 """
 
-
-from distutils.core import setup, Extension
+from __future__ import absolute_import
+from __future__ import print_function
+from setuptools import setup, Extension
 import sys
 
-
 _PACKAGE_NAME = 'mod_pywebsocket'
 
 # Build and use a C++ extension for faster masking. SWIG is required.
 _USE_FAST_MASKING = False
 
-if sys.version < '2.3':
-    print >> sys.stderr, '%s requires Python 2.3 or later.' % _PACKAGE_NAME
+# This is used since python_requires field is not recognized with
+# pip version 9.0.0 and earlier
+if sys.version < '2.7':
+    print('%s requires Python 2.7 or later.' % _PACKAGE_NAME, file=sys.stderr)
     sys.exit(1)
 
 if _USE_FAST_MASKING:
     setup(ext_modules=[
-                  Extension(
-                          'mod_pywebsocket/_fast_masking',
-                          ['mod_pywebsocket/fast_masking.i'],
-                          swig_opts=['-c++'])])
-
-setup(author='Yuzo Fujishima',
-      author_email='yuzo@chromium.org',
-      description='WebSocket extension for Apache HTTP Server.',
-      long_description=(
-              'mod_pywebsocket is an Apache HTTP Server extension for '
-              'the WebSocket Protocol (RFC 6455). '
-              'See mod_pywebsocket/__init__.py for more detail.'),
-      license='See LICENSE',
-      name=_PACKAGE_NAME,
-      packages=[_PACKAGE_NAME, _PACKAGE_NAME + '.handshake'],
-      url='http://code.google.com/p/pywebsocket/',
-      # See the source of distutils.version, distutils.versionpredicate and
-      # distutils.dist to understand how to name version numbers.
-      version='0.7.9',
-      )
+        Extension('mod_pywebsocket/_fast_masking',
+                  ['mod_pywebsocket/fast_masking.i'],
+                  swig_opts=['-c++'])
+    ])
 
+setup(
+    author='Yuzo Fujishima',
+    author_email='yuzo@chromium.org',
+    description='Standalone WebSocket Server for testing purposes.',
+    long_description=('mod_pywebsocket is a standalone server for '
+                      'the WebSocket Protocol (RFC 6455). '
+                      'See mod_pywebsocket/__init__.py for more detail.'),
+    license='See LICENSE',
+    name=_PACKAGE_NAME,
+    packages=[_PACKAGE_NAME, _PACKAGE_NAME + '.handshake'],
+    python_requires='>=2.7',
+    install_requires=['six'],
+    #TODO(suzukikeita): Update this to new Github URL
+    url='http://code.google.com/p/pywebsocket/',
+    version='3.0.0',
+)
 
 # vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/test/__init__.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/__init__.py
similarity index 100%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/test/__init__.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/__init__.py
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/test/cert/cacert.pem b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/cert/cacert.pem
similarity index 100%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/test/cert/cacert.pem
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/cert/cacert.pem
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/test/cert/cert.pem b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/cert/cert.pem
similarity index 100%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/test/cert/cert.pem
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/cert/cert.pem
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/test/cert/client_cert.p12 b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/cert/client_cert.p12
similarity index 100%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/test/cert/client_cert.p12
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/cert/client_cert.p12
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/test/cert/key.pem b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/cert/key.pem
similarity index 100%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/test/cert/key.pem
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/cert/key.pem
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/client_for_testing.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/client_for_testing.py
new file mode 100644
index 00000000000..450a6acd537
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/client_for_testing.py
@@ -0,0 +1,719 @@
+#!/usr/bin/env python
+#
+# Copyright 2012, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+"""WebSocket client utility for testing.
+
+This module contains helper methods for performing handshake, frame
+sending/receiving as a WebSocket client.
+
+This is code for testing mod_pywebsocket. Keep this code independent from
+mod_pywebsocket. Don't import e.g. Stream class for generating frame for
+testing. Using util.hexify, etc. that are not related to protocol processing
+is allowed.
+
+Note:
+This code is far from robust, e.g., we cut corners in handshake.
+"""
+
+from __future__ import absolute_import
+import base64
+import errno
+import logging
+import os
+import random
+import re
+import socket
+import struct
+import time
+from hashlib import sha1
+from six import iterbytes
+from six import indexbytes
+
+from mod_pywebsocket import common
+from mod_pywebsocket import util
+from mod_pywebsocket.handshake import HandshakeException
+
+DEFAULT_PORT = 80
+DEFAULT_SECURE_PORT = 443
+
+# Opcodes introduced in IETF HyBi 01 for the new framing format
+OPCODE_CONTINUATION = 0x0
+OPCODE_CLOSE = 0x8
+OPCODE_PING = 0x9
+OPCODE_PONG = 0xa
+OPCODE_TEXT = 0x1
+OPCODE_BINARY = 0x2
+
+# Strings used for handshake
+_UPGRADE_HEADER = 'Upgrade: websocket\r\n'
+_CONNECTION_HEADER = 'Connection: Upgrade\r\n'
+
+WEBSOCKET_ACCEPT_UUID = b'258EAFA5-E914-47DA-95CA-C5AB0DC85B11'
+
+# Status codes
+STATUS_NORMAL_CLOSURE = 1000
+STATUS_GOING_AWAY = 1001
+STATUS_PROTOCOL_ERROR = 1002
+STATUS_UNSUPPORTED_DATA = 1003
+STATUS_NO_STATUS_RECEIVED = 1005
+STATUS_ABNORMAL_CLOSURE = 1006
+STATUS_INVALID_FRAME_PAYLOAD_DATA = 1007
+STATUS_POLICY_VIOLATION = 1008
+STATUS_MESSAGE_TOO_BIG = 1009
+STATUS_MANDATORY_EXT = 1010
+STATUS_INTERNAL_ENDPOINT_ERROR = 1011
+STATUS_TLS_HANDSHAKE = 1015
+
+# Extension tokens
+_PERMESSAGE_DEFLATE_EXTENSION = 'permessage-deflate'
+
+
+def _method_line(resource):
+    return 'GET %s HTTP/1.1\r\n' % resource
+
+
+def _sec_origin_header(origin):
+    return 'Sec-WebSocket-Origin: %s\r\n' % origin.lower()
+
+
+def _origin_header(origin):
+    # 4.1 13. concatenation of the string "Origin:", a U+0020 SPACE character,
+    # and the /origin/ value, converted to ASCII lowercase, to /fields/.
+    return 'Origin: %s\r\n' % origin.lower()
+
+
+def _format_host_header(host, port, secure):
+    # 4.1 9. Let /hostport/ be an empty string.
+    # 4.1 10. Append the /host/ value, converted to ASCII lowercase, to
+    # /hostport/
+    hostport = host.lower()
+    # 4.1 11. If /secure/ is false, and /port/ is not 80, or if /secure/
+    # is true, and /port/ is not 443, then append a U+003A COLON character
+    # (:) followed by the value of /port/, expressed as a base-ten integer,
+    # to /hostport/
+    if ((not secure and port != DEFAULT_PORT)
+            or (secure and port != DEFAULT_SECURE_PORT)):
+        hostport += ':' + str(port)
+    # 4.1 12. concatenation of the string "Host:", a U+0020 SPACE
+    # character, and /hostport/, to /fields/.
+    return 'Host: %s\r\n' % hostport
+
+
+# TODO(tyoshino): Define a base class and move these shared methods to that.
+
+
+def receive_bytes(socket, length):
+    received_bytes = []
+    remaining = length
+    while remaining > 0:
+        new_received_bytes = socket.recv(remaining)
+        if not new_received_bytes:
+            raise Exception(
+                'Connection closed before receiving requested length '
+                '(requested %d bytes but received only %d bytes)' %
+                (length, length - remaining))
+        received_bytes.append(new_received_bytes)
+        remaining -= len(new_received_bytes)
+    return b''.join(received_bytes)
+
+
+# TODO(tyoshino): Now the WebSocketHandshake class diverts these methods. We
+# should move to HTTP parser as specified in RFC 6455.
+
+
+def _read_fields(socket):
+    # 4.1 32. let /fields/ be a list of name-value pairs, initially empty.
+    fields = {}
+    while True:
+        # 4.1 33. let /name/ and /value/ be empty byte arrays
+        name = b''
+        value = b''
+        # 4.1 34. read /name/
+        name = _read_name(socket)
+        if name is None:
+            break
+        # 4.1 35. read spaces
+        # TODO(tyoshino): Skip only one space as described in the spec.
+        ch = _skip_spaces(socket)
+        # 4.1 36. read /value/
+        value = _read_value(socket, ch)
+        # 4.1 37. read a byte from the server
+        ch = receive_bytes(socket, 1)
+        if ch != b'\n':  # 0x0A
+            raise Exception(
+                'Expected LF but found %r while reading value %r for header '
+                '%r' % (ch, name, value))
+        # 4.1 38. append an entry to the /fields/ list that has the name
+        # given by the string obtained by interpreting the /name/ byte
+        # array as a UTF-8 stream and the value given by the string
+        # obtained by interpreting the /value/ byte array as a UTF-8 byte
+        # stream.
+        fields.setdefault(name.decode('UTF-8'),
+                          []).append(value.decode('UTF-8'))
+        # 4.1 39. return to the "Field" step above
+    return fields
+
+
+def _read_name(socket):
+    # 4.1 33. let /name/ be empty byte arrays
+    name = b''
+    while True:
+        # 4.1 34. read a byte from the server
+        ch = receive_bytes(socket, 1)
+        if ch == b'\r':  # 0x0D
+            return None
+        elif ch == b'\n':  # 0x0A
+            raise Exception('Unexpected LF when reading header name %r' % name)
+        elif ch == b':':  # 0x3A
+            return name.lower()
+        else:
+            name += ch
+
+
+def _skip_spaces(socket):
+    # 4.1 35. read a byte from the server
+    while True:
+        ch = receive_bytes(socket, 1)
+        if ch == b' ':  # 0x20
+            continue
+        return ch
+
+
+def _read_value(socket, ch):
+    # 4.1 33. let /value/ be empty byte arrays
+    value = b''
+    # 4.1 36. read a byte from server.
+    while True:
+        if ch == b'\r':  # 0x0D
+            return value
+        elif ch == b'\n':  # 0x0A
+            raise Exception('Unexpected LF when reading header value %r' %
+                            value)
+        else:
+            value += ch
+        ch = receive_bytes(socket, 1)
+
+
+def read_frame_header(socket):
+
+    first_byte = ord(receive_bytes(socket, 1))
+    fin = (first_byte >> 7) & 1
+    rsv1 = (first_byte >> 6) & 1
+    rsv2 = (first_byte >> 5) & 1
+    rsv3 = (first_byte >> 4) & 1
+    opcode = first_byte & 0xf
+
+    second_byte = ord(receive_bytes(socket, 1))
+    mask = (second_byte >> 7) & 1
+    payload_length = second_byte & 0x7f
+
+    if mask != 0:
+        raise Exception('Mask bit must be 0 for frames coming from server')
+
+    if payload_length == 127:
+        extended_payload_length = receive_bytes(socket, 8)
+        payload_length = struct.unpack('!Q', extended_payload_length)[0]
+        if payload_length > 0x7FFFFFFFFFFFFFFF:
+            raise Exception('Extended payload length >= 2^63')
+    elif payload_length == 126:
+        extended_payload_length = receive_bytes(socket, 2)
+        payload_length = struct.unpack('!H', extended_payload_length)[0]
+
+    return fin, rsv1, rsv2, rsv3, opcode, payload_length
+
+
+class _TLSSocket(object):
+    """Wrapper for a TLS connection."""
+    def __init__(self, raw_socket):
+        self._ssl = socket.ssl(raw_socket)
+
+    def send(self, bytes):
+        return self._ssl.write(bytes)
+
+    def recv(self, size=-1):
+        return self._ssl.read(size)
+
+    def close(self):
+        # Nothing to do.
+        pass
+
+
+class HttpStatusException(Exception):
+    """This exception will be raised when unexpected http status code was
+    received as a result of handshake.
+    """
+    def __init__(self, name, status):
+        super(HttpStatusException, self).__init__(name)
+        self.status = status
+
+
+class WebSocketHandshake(object):
+    """Opening handshake processor for the WebSocket protocol (RFC 6455)."""
+    def __init__(self, options):
+        self._logger = util.get_class_logger(self)
+
+        self._options = options
+
+    def handshake(self, socket):
+        """Handshake WebSocket.
+
+        Raises:
+            Exception: handshake failed.
+        """
+
+        self._socket = socket
+
+        request_line = _method_line(self._options.resource)
+        self._logger.debug('Opening handshake Request-Line: %r', request_line)
+        self._socket.sendall(request_line.encode('UTF-8'))
+
+        fields = []
+        fields.append(_UPGRADE_HEADER)
+        fields.append(_CONNECTION_HEADER)
+
+        fields.append(
+            _format_host_header(self._options.server_host,
+                                self._options.server_port,
+                                self._options.use_tls))
+
+        if self._options.version is 8:
+            fields.append(_sec_origin_header(self._options.origin))
+        else:
+            fields.append(_origin_header(self._options.origin))
+
+        original_key = os.urandom(16)
+        key = base64.b64encode(original_key)
+        self._logger.debug('Sec-WebSocket-Key: %s (%s)', key,
+                           util.hexify(original_key))
+        fields.append(u'Sec-WebSocket-Key: %s\r\n' % key.decode('UTF-8'))
+
+        fields.append(u'Sec-WebSocket-Version: %d\r\n' % self._options.version)
+
+        # Setting up extensions.
+        if len(self._options.extensions) > 0:
+            fields.append(u'Sec-WebSocket-Extensions: %s\r\n' %
+                          ', '.join(self._options.extensions))
+
+        self._logger.debug('Opening handshake request headers: %r', fields)
+
+        for field in fields:
+            self._socket.sendall(field.encode('UTF-8'))
+        self._socket.sendall(b'\r\n')
+
+        self._logger.info('Sent opening handshake request')
+
+        field = b''
+        while True:
+            ch = receive_bytes(self._socket, 1)
+            field += ch
+            if ch == b'\n':
+                break
+
+        self._logger.debug('Opening handshake Response-Line: %r', field)
+
+        # Will raise a UnicodeDecodeError when the decode fails
+        if len(field) < 7 or not field.endswith(b'\r\n'):
+            raise Exception('Wrong status line: %s' % field.decode('Latin-1'))
+        m = re.match(b'[^ ]* ([^ ]*) .*', field)
+        if m is None:
+            raise Exception('No HTTP status code found in status line: %s' %
+                            field.decode('Latin-1'))
+        code = m.group(1)
+        if not re.match(b'[0-9][0-9][0-9]$', code):
+            raise Exception(
+                'HTTP status code %s is not three digit in status line: %s' %
+                (code.decode('Latin-1'), field.decode('Latin-1')))
+        if code != b'101':
+            raise HttpStatusException(
+                'Expected HTTP status code 101 but found %s in status line: '
+                '%r' % (code.decode('Latin-1'), field.decode('Latin-1')),
+                int(code))
+        fields = _read_fields(self._socket)
+        ch = receive_bytes(self._socket, 1)
+        if ch != b'\n':  # 0x0A
+            raise Exception('Expected LF but found: %r' % ch)
+
+        self._logger.debug('Opening handshake response headers: %r', fields)
+
+        # Check /fields/
+        if len(fields['upgrade']) != 1:
+            raise Exception('Multiple Upgrade headers found: %s' %
+                            fields['upgrade'])
+        if len(fields['connection']) != 1:
+            raise Exception('Multiple Connection headers found: %s' %
+                            fields['connection'])
+        if fields['upgrade'][0] != 'websocket':
+            raise Exception('Unexpected Upgrade header value: %s' %
+                            fields['upgrade'][0])
+        if fields['connection'][0].lower() != 'upgrade':
+            raise Exception('Unexpected Connection header value: %s' %
+                            fields['connection'][0])
+
+        if len(fields['sec-websocket-accept']) != 1:
+            raise Exception('Multiple Sec-WebSocket-Accept headers found: %s' %
+                            fields['sec-websocket-accept'])
+
+        accept = fields['sec-websocket-accept'][0]
+
+        # Validate
+        try:
+            decoded_accept = base64.b64decode(accept)
+        except TypeError as e:
+            raise HandshakeException(
+                'Illegal value for header Sec-WebSocket-Accept: ' + accept)
+
+        if len(decoded_accept) != 20:
+            raise HandshakeException(
+                'Decoded value of Sec-WebSocket-Accept is not 20-byte long')
+
+        self._logger.debug('Actual Sec-WebSocket-Accept: %r (%s)', accept,
+                           util.hexify(decoded_accept))
+
+        original_expected_accept = sha1(key + WEBSOCKET_ACCEPT_UUID).digest()
+        expected_accept = base64.b64encode(original_expected_accept)
+
+        self._logger.debug('Expected Sec-WebSocket-Accept: %r (%s)',
+                           expected_accept,
+                           util.hexify(original_expected_accept))
+
+        if accept != expected_accept.decode('UTF-8'):
+            raise Exception(
+                'Invalid Sec-WebSocket-Accept header: %r (expected) != %r '
+                '(actual)' % (accept, expected_accept))
+
+        server_extensions_header = fields.get('sec-websocket-extensions')
+        accepted_extensions = []
+        if server_extensions_header is not None:
+            accepted_extensions = common.parse_extensions(
+                ', '.join(server_extensions_header))
+
+        # Scan accepted extension list to check if there is any unrecognized
+        # extensions or extensions we didn't request in it. Then, for
+        # extensions we request, parse them and store parameters. They will be
+        # used later by each extension.
+        for extension in accepted_extensions:
+            if extension.name() == _PERMESSAGE_DEFLATE_EXTENSION:
+                checker = self._options.check_permessage_deflate
+                if checker:
+                    checker(extension)
+                    continue
+
+            raise Exception('Received unrecognized extension: %s' %
+                            extension.name())
+
+
+class WebSocketStream(object):
+    """Frame processor for the WebSocket protocol (RFC 6455)."""
+    def __init__(self, socket, handshake):
+        self._handshake = handshake
+        self._socket = socket
+
+        # Filters applied to application data part of data frames.
+        self._outgoing_frame_filter = None
+        self._incoming_frame_filter = None
+
+        self._fragmented = False
+
+    def _mask_hybi(self, s):
+        # TODO(tyoshino): os.urandom does open/read/close for every call. If
+        # performance matters, change this to some library call that generates
+        # cryptographically secure pseudo random number sequence.
+        masking_nonce = os.urandom(4)
+        result = [masking_nonce]
+        count = 0
+        for c in iterbytes(s):
+            result.append(util.pack_byte(c ^ indexbytes(masking_nonce, count)))
+            count = (count + 1) % len(masking_nonce)
+        return b''.join(result)
+
+    def send_frame_of_arbitrary_bytes(self, header, body):
+        self._socket.sendall(header + self._mask_hybi(body))
+
+    def send_data(self,
+                  payload,
+                  frame_type,
+                  end=True,
+                  mask=True,
+                  rsv1=0,
+                  rsv2=0,
+                  rsv3=0):
+        if self._outgoing_frame_filter is not None:
+            payload = self._outgoing_frame_filter.filter(payload)
+
+        if self._fragmented:
+            opcode = OPCODE_CONTINUATION
+        else:
+            opcode = frame_type
+
+        if end:
+            self._fragmented = False
+            fin = 1
+        else:
+            self._fragmented = True
+            fin = 0
+
+        if mask:
+            mask_bit = 1 << 7
+        else:
+            mask_bit = 0
+
+        header = util.pack_byte(fin << 7 | rsv1 << 6 | rsv2 << 5 | rsv3 << 4
+                                | opcode)
+        payload_length = len(payload)
+        if payload_length <= 125:
+            header += util.pack_byte(mask_bit | payload_length)
+        elif payload_length < 1 << 16:
+            header += util.pack_byte(mask_bit | 126) + struct.pack(
+                '!H', payload_length)
+        elif payload_length < 1 << 63:
+            header += util.pack_byte(mask_bit | 127) + struct.pack(
+                '!Q', payload_length)
+        else:
+            raise Exception('Too long payload (%d byte)' % payload_length)
+        if mask:
+            payload = self._mask_hybi(payload)
+        self._socket.sendall(header + payload)
+
+    def send_binary(self, payload, end=True, mask=True):
+        self.send_data(payload, OPCODE_BINARY, end, mask)
+
+    def send_text(self, payload, end=True, mask=True):
+        self.send_data(payload.encode('utf-8'), OPCODE_TEXT, end, mask)
+
+    def _assert_receive_data(self, payload, opcode, fin, rsv1, rsv2, rsv3):
+        (actual_fin, actual_rsv1, actual_rsv2, actual_rsv3, actual_opcode,
+         payload_length) = read_frame_header(self._socket)
+
+        if actual_opcode != opcode:
+            raise Exception('Unexpected opcode: %d (expected) vs %d (actual)' %
+                            (opcode, actual_opcode))
+
+        if actual_fin != fin:
+            raise Exception('Unexpected fin: %d (expected) vs %d (actual)' %
+                            (fin, actual_fin))
+
+        if rsv1 is None:
+            rsv1 = 0
+
+        if rsv2 is None:
+            rsv2 = 0
+
+        if rsv3 is None:
+            rsv3 = 0
+
+        if actual_rsv1 != rsv1:
+            raise Exception('Unexpected rsv1: %r (expected) vs %r (actual)' %
+                            (rsv1, actual_rsv1))
+
+        if actual_rsv2 != rsv2:
+            raise Exception('Unexpected rsv2: %r (expected) vs %r (actual)' %
+                            (rsv2, actual_rsv2))
+
+        if actual_rsv3 != rsv3:
+            raise Exception('Unexpected rsv3: %r (expected) vs %r (actual)' %
+                            (rsv3, actual_rsv3))
+
+        received = receive_bytes(self._socket, payload_length)
+
+        if self._incoming_frame_filter is not None:
+            received = self._incoming_frame_filter.filter(received)
+
+        if len(received) != len(payload):
+            raise Exception(
+                'Unexpected payload length: %d (expected) vs %d (actual)' %
+                (len(payload), len(received)))
+
+        if payload != received:
+            raise Exception(
+                'Unexpected payload: %r (expected) vs %r (actual)' %
+                (payload, received))
+
+    def assert_receive_binary(self,
+                              payload,
+                              opcode=OPCODE_BINARY,
+                              fin=1,
+                              rsv1=None,
+                              rsv2=None,
+                              rsv3=None):
+        self._assert_receive_data(payload, opcode, fin, rsv1, rsv2, rsv3)
+
+    def assert_receive_text(self,
+                            payload,
+                            opcode=OPCODE_TEXT,
+                            fin=1,
+                            rsv1=None,
+                            rsv2=None,
+                            rsv3=None):
+        self._assert_receive_data(payload.encode('utf-8'), opcode, fin, rsv1,
+                                  rsv2, rsv3)
+
+    def _build_close_frame(self, code, reason, mask):
+        frame = util.pack_byte(1 << 7 | OPCODE_CLOSE)
+
+        if code is not None:
+            body = struct.pack('!H', code) + reason.encode('utf-8')
+        else:
+            body = b''
+        if mask:
+            frame += util.pack_byte(1 << 7 | len(body)) + self._mask_hybi(body)
+        else:
+            frame += util.pack_byte(len(body)) + body
+        return frame
+
+    def send_close(self, code, reason):
+        self._socket.sendall(self._build_close_frame(code, reason, True))
+
+    def assert_receive_close(self, code, reason):
+        expected_frame = self._build_close_frame(code, reason, False)
+        actual_frame = receive_bytes(self._socket, len(expected_frame))
+        if actual_frame != expected_frame:
+            raise Exception(
+                'Unexpected close frame: %r (expected) vs %r (actual)' %
+                (expected_frame, actual_frame))
+
+
+class ClientOptions(object):
+    """Holds option values to configure the Client object."""
+    def __init__(self):
+        self.version = 13
+        self.server_host = ''
+        self.origin = ''
+        self.resource = ''
+        self.server_port = -1
+        self.socket_timeout = 1000
+        self.use_tls = False
+        self.extensions = []
+
+
+def connect_socket_with_retry(host,
+                              port,
+                              timeout,
+                              use_tls,
+                              retry=10,
+                              sleep_sec=0.1):
+    retry_count = 0
+    while retry_count < retry:
+        try:
+            s = socket.socket()
+            s.settimeout(timeout)
+            s.connect((host, port))
+            if use_tls:
+                return _TLSSocket(s)
+            return s
+        except socket.error as e:
+            if e.errno != errno.ECONNREFUSED:
+                raise
+            else:
+                retry_count = retry_count + 1
+                time.sleep(sleep_sec)
+
+    return None
+
+
+class Client(object):
+    """WebSocket client."""
+    def __init__(self, options, handshake, stream_class):
+        self._logger = util.get_class_logger(self)
+
+        self._options = options
+        self._socket = None
+
+        self._handshake = handshake
+        self._stream_class = stream_class
+
+    def connect(self):
+        self._socket = connect_socket_with_retry(self._options.server_host,
+                                                 self._options.server_port,
+                                                 self._options.socket_timeout,
+                                                 self._options.use_tls)
+
+        self._handshake.handshake(self._socket)
+
+        self._stream = self._stream_class(self._socket, self._handshake)
+
+        self._logger.info('Connection established')
+
+    def send_frame_of_arbitrary_bytes(self, header, body):
+        self._stream.send_frame_of_arbitrary_bytes(header, body)
+
+    def send_message(self,
+                     message,
+                     end=True,
+                     binary=False,
+                     raw=False,
+                     mask=True):
+        if binary:
+            self._stream.send_binary(message, end, mask)
+        elif raw:
+            self._stream.send_data(message, OPCODE_TEXT, end, mask)
+        else:
+            self._stream.send_text(message, end, mask)
+
+    def assert_receive(self, payload, binary=False):
+        if binary:
+            self._stream.assert_receive_binary(payload)
+        else:
+            self._stream.assert_receive_text(payload)
+
+    def send_close(self, code=STATUS_NORMAL_CLOSURE, reason=''):
+        self._stream.send_close(code, reason)
+
+    def assert_receive_close(self, code=STATUS_NORMAL_CLOSURE, reason=''):
+        self._stream.assert_receive_close(code, reason)
+
+    def close_socket(self):
+        self._socket.close()
+
+    def assert_connection_closed(self):
+        try:
+            read_data = receive_bytes(self._socket, 1)
+        except Exception as e:
+            if str(e).find(
+                    'Connection closed before receiving requested length '
+            ) == 0:
+                return
+            try:
+                error_number, message = e
+                for error_name in ['ECONNRESET', 'WSAECONNRESET']:
+                    if (error_name in dir(errno)
+                            and error_number == getattr(errno, error_name)):
+                        return
+            except:
+                raise e
+            raise e
+
+        raise Exception('Connection is not closed (Read: %r)' % read_data)
+
+
+def create_client(options):
+    return Client(options, WebSocketHandshake(options), WebSocketStream)
+
+
+# vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/test/mock.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/mock.py
similarity index 82%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/test/mock.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/mock.py
index 6bffcac48dc..eeaef52ecf0 100644
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/test/mock.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/mock.py
@@ -26,17 +26,20 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 """Mocks for testing.
 """
 
-
-import Queue
+from __future__ import absolute_import
+import six.moves.queue
 import threading
+import struct
+import six
 
 from mod_pywebsocket import common
-from mod_pywebsocket.stream import StreamHixie75
+from mod_pywebsocket import util
+from mod_pywebsocket.stream import Stream
+from mod_pywebsocket.stream import StreamOptions
+from six.moves import range
 
 
 class _MockConnBase(object):
@@ -44,20 +47,22 @@ class _MockConnBase(object):
 
     This enables tests to check what is written to a (mock) mp_conn.
     """
-
     def __init__(self):
         self._write_data = []
-        self.remote_addr = 'fake_address'
+        self.remote_addr = b'fake_address'
 
     def write(self, data):
-        """Override mod_python.apache.mp_conn.write."""
+        """Override mod_python.apache.mp_conn.write.
+
+        data should be bytes when touching this method manually.
+        """
 
         self._write_data.append(data)
 
     def written_data(self):
         """Get bytes written to this mock."""
 
-        return ''.join(self._write_data)
+        return b''.join(self._write_data)
 
 
 class MockConn(_MockConnBase):
@@ -66,7 +71,6 @@ class MockConn(_MockConnBase):
     This enables tests to specify what should be read from a (mock) mp_conn as
     well as to check what is written to it.
     """
-
     def __init__(self, read_data):
         """Constructs an instance.
 
@@ -83,8 +87,8 @@ class MockConn(_MockConnBase):
         """Override mod_python.apache.mp_conn.readline."""
 
         if self._read_pos >= len(self._read_data):
-            return ''
-        end_index = self._read_data.find('\n', self._read_pos) + 1
+            return b''
+        end_index = self._read_data.find(b'\n', self._read_pos) + 1
         if not end_index:
             end_index = len(self._read_data)
         return self._read_up_to(end_index)
@@ -93,7 +97,7 @@ class MockConn(_MockConnBase):
         """Override mod_python.apache.mp_conn.read."""
 
         if self._read_pos >= len(self._read_data):
-            return ''
+            return b''
         end_index = min(len(self._read_data), self._read_pos + length)
         return self._read_up_to(end_index)
 
@@ -110,27 +114,27 @@ class MockBlockingConn(_MockConnBase):
     well as to check what is written to it.
     Callers of read* methods will block if there is no bytes available.
     """
-
     def __init__(self):
         _MockConnBase.__init__(self)
-        self._queue = Queue.Queue()
+        self._queue = six.moves.queue.Queue()
 
     def readline(self):
         """Override mod_python.apache.mp_conn.readline."""
-        line = ''
+        line = bytearray()
         while True:
             c = self._queue.get()
-            line += c
-            if c == '\n':
-                return line
+            line.append(c)
+            if c == ord(b'\n'):
+                return bytes(line)
 
     def read(self, length):
         """Override mod_python.apache.mp_conn.read."""
 
-        data = ''
+        data = bytearray()
         for unused in range(length):
-            data += self._queue.get()
-        return data
+            data.append(self._queue.get())
+
+        return bytes(data)
 
     def put_bytes(self, bytes):
         """Put bytes to be read from this mock.
@@ -139,7 +143,7 @@ class MockBlockingConn(_MockConnBase):
             bytes: bytes to be read.
         """
 
-        for byte in bytes:
+        for byte in six.iterbytes(bytes):
             self._queue.put(byte)
 
 
@@ -149,10 +153,9 @@ class MockTable(dict):
     This mimics mod_python mp_table. Note that only the methods used by
     tests are overridden.
     """
-
     def __init__(self, copy_from={}):
         if isinstance(copy_from, dict):
-            copy_from = copy_from.items()
+            copy_from = list(copy_from.items())
         for key, value in copy_from:
             self.__setitem__(key, value)
 
@@ -171,9 +174,13 @@ class MockRequest(object):
 
     This mimics mod_python request.
     """
-
-    def __init__(self, uri=None, headers_in={}, connection=None, method='GET',
-                 protocol='HTTP/1.1', is_https=False):
+    def __init__(self,
+                 uri=None,
+                 headers_in={},
+                 connection=None,
+                 method='GET',
+                 protocol='HTTP/1.1',
+                 is_https=False):
         """Construct an instance.
 
         Arguments:
@@ -194,10 +201,10 @@ class MockRequest(object):
         # self.is_https_ needs to be accessible from tests.  To avoid name
         # conflict with self.is_https(), it is named as such.
         self.is_https_ = is_https
-        self.ws_stream = StreamHixie75(self, True)
+        self.ws_stream = Stream(self, StreamOptions())
         self.ws_close_code = None
         self.ws_close_reason = None
-        self.ws_version = common.VERSION_HYBI00
+        self.ws_version = common.VERSION_HYBI_LATEST
         self.ws_deflate = False
 
     def is_https(self):
@@ -207,7 +214,6 @@ class MockRequest(object):
 
 class MockDispatcher(object):
     """Mock for dispatch.Dispatcher."""
-
     def __init__(self):
         self.do_extra_handshake_called = False
 
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/test/run_all.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/run_all.py
similarity index 81%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/test/run_all.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/run_all.py
index 80a5d87d838..f622015539e 100755
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/test/run_all.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/run_all.py
@@ -28,8 +28,6 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 """Run all tests in the same directory.
 
 This suite is expected to be run under pywebsocket's src directory, i.e. the
@@ -43,7 +41,7 @@ example, run this for making the test runner verbose.
     python test/run_test.py --log-level debug -- -v
 """
 
-
+from __future__ import absolute_import
 import logging
 import optparse
 import os
@@ -51,7 +49,6 @@ import re
 import sys
 import unittest
 
-
 _TEST_MODULE_PATTERN = re.compile(r'^(test_.+)\.py$')
 
 
@@ -67,23 +64,24 @@ def _list_test_modules(directory):
 def _suite():
     loader = unittest.TestLoader()
     return loader.loadTestsFromNames(
-            _list_test_modules(os.path.join(os.path.split(__file__)[0], '.')))
+        _list_test_modules(os.path.join(os.path.split(__file__)[0], '.')))
 
 
 if __name__ == '__main__':
     parser = optparse.OptionParser()
-    parser.add_option('--log-level', '--log_level', type='choice',
-                      dest='log_level', default='warning',
-                      choices=['debug', 'info', 'warning', 'warn', 'error',
-                               'critical'])
+    parser.add_option(
+        '--log-level',
+        '--log_level',
+        type='choice',
+        dest='log_level',
+        default='warning',
+        choices=['debug', 'info', 'warning', 'warn', 'error', 'critical'])
     options, args = parser.parse_args()
-    logging.basicConfig(
-            level=logging.getLevelName(options.log_level.upper()),
-            format='%(levelname)s %(asctime)s '
-                   '%(filename)s:%(lineno)d] '
-                   '%(message)s',
-            datefmt='%H:%M:%S')
+    logging.basicConfig(level=logging.getLevelName(options.log_level.upper()),
+                        format='%(levelname)s %(asctime)s '
+                        '%(filename)s:%(lineno)d] '
+                        '%(message)s',
+                        datefmt='%H:%M:%S')
     unittest.main(defaultTest='_suite', argv=[sys.argv[0]] + args)
 
-
 # vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/test/set_sys_path.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/set_sys_path.py
similarity index 97%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/test/set_sys_path.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/set_sys_path.py
index e3c6db9ea4d..9fce7b34b67 100644
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/test/set_sys_path.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/set_sys_path.py
@@ -26,20 +26,16 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 """Configuration for testing.
 
 Test files should import this module before mod_pywebsocket.
 """
 
-
+from __future__ import absolute_import
 import os
 import sys
 
-
 # Add the parent directory to sys.path to enable importing mod_pywebsocket.
 sys.path.insert(0, os.path.join(os.path.split(__file__)[0], '..'))
 
-
 # vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_dispatch.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_dispatch.py
similarity index 62%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/test/test_dispatch.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_dispatch.py
index e16d605609c..ae63980f258 100755
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_dispatch.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_dispatch.py
@@ -28,11 +28,9 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 """Tests for dispatch module."""
 
-
+from __future__ import absolute_import
 import os
 import unittest
 
@@ -41,26 +39,29 @@ import set_sys_path  # Update sys.path to locate mod_pywebsocket module.
 from mod_pywebsocket import dispatch
 from mod_pywebsocket import handshake
 from test import mock
-
+from six.moves import zip
 
 _TEST_HANDLERS_DIR = os.path.join(
-        os.path.split(__file__)[0], 'testdata', 'handlers')
+    os.path.split(__file__)[0], 'testdata', 'handlers')
 
 _TEST_HANDLERS_SUB_DIR = os.path.join(_TEST_HANDLERS_DIR, 'sub')
 
 
 class DispatcherTest(unittest.TestCase):
     """A unittest for dispatch module."""
-
     def test_normalize_path(self):
-        self.assertEqual(os.path.abspath('/a/b').replace('\\', '/'),
-                         dispatch._normalize_path('/a/b'))
-        self.assertEqual(os.path.abspath('/a/b').replace('\\', '/'),
-                         dispatch._normalize_path('\\a\\b'))
-        self.assertEqual(os.path.abspath('/a/b').replace('\\', '/'),
-                         dispatch._normalize_path('/a/c/../b'))
-        self.assertEqual(os.path.abspath('abc').replace('\\', '/'),
-                         dispatch._normalize_path('abc'))
+        self.assertEqual(
+            os.path.abspath('/a/b').replace('\\', '/'),
+            dispatch._normalize_path('/a/b'))
+        self.assertEqual(
+            os.path.abspath('/a/b').replace('\\', '/'),
+            dispatch._normalize_path('\\a\\b'))
+        self.assertEqual(
+            os.path.abspath('/a/b').replace('\\', '/'),
+            dispatch._normalize_path('/a/c/../b'))
+        self.assertEqual(
+            os.path.abspath('abc').replace('\\', '/'),
+            dispatch._normalize_path('abc'))
 
     def test_converter(self):
         converter = dispatch._create_path_to_resource_converter('/a/b')
@@ -74,13 +75,13 @@ class DispatcherTest(unittest.TestCase):
         self.assertEqual(None, converter('a/b/h_wsh.py'))
 
         converter = dispatch._create_path_to_resource_converter('a/b')
-        self.assertEqual('/h', converter(dispatch._normalize_path(
-            'a/b/h_wsh.py')))
+        self.assertEqual('/h',
+                         converter(dispatch._normalize_path('a/b/h_wsh.py')))
 
         converter = dispatch._create_path_to_resource_converter('/a/b///')
         self.assertEqual('/h', converter(os_root + 'a/b/h_wsh.py'))
-        self.assertEqual('/h', converter(dispatch._normalize_path(
-            '/a/b/../b/h_wsh.py')))
+        self.assertEqual(
+            '/h', converter(dispatch._normalize_path('/a/b/../b/h_wsh.py')))
 
         converter = dispatch._create_path_to_resource_converter(
             '/a/../a/b/../b/')
@@ -96,29 +97,30 @@ class DispatcherTest(unittest.TestCase):
         paths.sort()
         self.assertEqual(8, len(paths))
         expected_paths = [
-                os.path.join(_TEST_HANDLERS_DIR, 'abort_by_user_wsh.py'),
-                os.path.join(_TEST_HANDLERS_DIR, 'blank_wsh.py'),
-                os.path.join(_TEST_HANDLERS_DIR, 'origin_check_wsh.py'),
-                os.path.join(_TEST_HANDLERS_DIR, 'sub',
-                             'exception_in_transfer_wsh.py'),
-                os.path.join(_TEST_HANDLERS_DIR, 'sub', 'non_callable_wsh.py'),
-                os.path.join(_TEST_HANDLERS_DIR, 'sub', 'plain_wsh.py'),
-                os.path.join(_TEST_HANDLERS_DIR, 'sub',
-                             'wrong_handshake_sig_wsh.py'),
-                os.path.join(_TEST_HANDLERS_DIR, 'sub',
-                             'wrong_transfer_sig_wsh.py'),
-                ]
+            os.path.join(_TEST_HANDLERS_DIR, 'abort_by_user_wsh.py'),
+            os.path.join(_TEST_HANDLERS_DIR, 'blank_wsh.py'),
+            os.path.join(_TEST_HANDLERS_DIR, 'origin_check_wsh.py'),
+            os.path.join(_TEST_HANDLERS_DIR, 'sub',
+                         'exception_in_transfer_wsh.py'),
+            os.path.join(_TEST_HANDLERS_DIR, 'sub', 'non_callable_wsh.py'),
+            os.path.join(_TEST_HANDLERS_DIR, 'sub', 'plain_wsh.py'),
+            os.path.join(_TEST_HANDLERS_DIR, 'sub',
+                         'wrong_handshake_sig_wsh.py'),
+            os.path.join(_TEST_HANDLERS_DIR, 'sub',
+                         'wrong_transfer_sig_wsh.py'),
+        ]
         for expected, actual in zip(expected_paths, paths):
             self.assertEqual(expected, actual)
 
     def test_source_handler_file(self):
-        self.assertRaises(
-            dispatch.DispatchException, dispatch._source_handler_file, '')
-        self.assertRaises(
-            dispatch.DispatchException, dispatch._source_handler_file, 'def')
-        self.assertRaises(
-            dispatch.DispatchException, dispatch._source_handler_file, '1/0')
-        self.failUnless(dispatch._source_handler_file(
+        self.assertRaises(dispatch.DispatchException,
+                          dispatch._source_handler_file, '')
+        self.assertRaises(dispatch.DispatchException,
+                          dispatch._source_handler_file, 'def')
+        self.assertRaises(dispatch.DispatchException,
+                          dispatch._source_handler_file, '1/0')
+        self.assertTrue(
+            dispatch._source_handler_file(
                 'def web_socket_do_extra_handshake(request):pass\n'
                 'def web_socket_transfer_data(request):pass\n'))
 
@@ -127,22 +129,23 @@ class DispatcherTest(unittest.TestCase):
         warnings = dispatcher.source_warnings()
         warnings.sort()
         expected_warnings = [
-                (os.path.realpath(os.path.join(
-                    _TEST_HANDLERS_DIR, 'blank_wsh.py')) +
-                 ': web_socket_do_extra_handshake is not defined.'),
-                (os.path.realpath(os.path.join(
-                    _TEST_HANDLERS_DIR, 'sub', 'non_callable_wsh.py')) +
-                 ': web_socket_do_extra_handshake is not callable.'),
-                (os.path.realpath(os.path.join(
-                    _TEST_HANDLERS_DIR, 'sub', 'wrong_handshake_sig_wsh.py')) +
-                 ': web_socket_do_extra_handshake is not defined.'),
-                (os.path.realpath(os.path.join(
-                    _TEST_HANDLERS_DIR, 'sub', 'wrong_transfer_sig_wsh.py')) +
-                 ': web_socket_transfer_data is not defined.'),
-                ]
-        self.assertEquals(4, len(warnings))
+            (os.path.realpath(os.path.join(_TEST_HANDLERS_DIR, 'blank_wsh.py'))
+             + ': web_socket_do_extra_handshake is not defined.'),
+            (os.path.realpath(
+                os.path.join(_TEST_HANDLERS_DIR, 'sub', 'non_callable_wsh.py'))
+             + ': web_socket_do_extra_handshake is not callable.'),
+            (os.path.realpath(
+                os.path.join(_TEST_HANDLERS_DIR, 'sub',
+                             'wrong_handshake_sig_wsh.py')) +
+             ': web_socket_do_extra_handshake is not defined.'),
+            (os.path.realpath(
+                os.path.join(_TEST_HANDLERS_DIR, 'sub',
+                             'wrong_transfer_sig_wsh.py')) +
+             ': web_socket_transfer_data is not defined.'),
+        ]
+        self.assertEqual(4, len(warnings))
         for expected, actual in zip(expected_warnings, warnings):
-            self.assertEquals(expected, actual)
+            self.assertEqual(expected, actual)
 
     def test_do_extra_handshake(self):
         dispatcher = dispatch.Dispatcher(_TEST_HANDLERS_DIR, None)
@@ -156,7 +159,7 @@ class DispatcherTest(unittest.TestCase):
             dispatcher.do_extra_handshake(request)
             self.fail('Could not catch HandshakeException with 403 status')
         except handshake.HandshakeException as e:
-            self.assertEquals(403, e.status)
+            self.assertEqual(403, e.status)
         except Exception as e:
             self.fail('Unexpected exception: %r' % e)
 
@@ -170,64 +173,71 @@ class DispatcherTest(unittest.TestCase):
     def test_transfer_data(self):
         dispatcher = dispatch.Dispatcher(_TEST_HANDLERS_DIR, None)
 
-        request = mock.MockRequest(connection=mock.MockConn('\xff\x00'))
+        request = mock.MockRequest(
+            connection=mock.MockConn(b'\x88\x02\x03\xe8'))
         request.ws_resource = '/origin_check'
         request.ws_protocol = 'p1'
         dispatcher.transfer_data(request)
-        self.assertEqual('origin_check_wsh.py is called for /origin_check, p1'
-                         '\xff\x00',
-                         request.connection.written_data())
+        self.assertEqual(
+            b'origin_check_wsh.py is called for /origin_check, p1'
+            b'\x88\x02\x03\xe8', request.connection.written_data())
 
-        request = mock.MockRequest(connection=mock.MockConn('\xff\x00'))
+        request = mock.MockRequest(
+            connection=mock.MockConn(b'\x88\x02\x03\xe8'))
         request.ws_resource = '/sub/plain'
         request.ws_protocol = None
         dispatcher.transfer_data(request)
-        self.assertEqual('sub/plain_wsh.py is called for /sub/plain, None'
-                         '\xff\x00',
-                         request.connection.written_data())
+        self.assertEqual(
+            b'sub/plain_wsh.py is called for /sub/plain, None'
+            b'\x88\x02\x03\xe8', request.connection.written_data())
 
-        request = mock.MockRequest(connection=mock.MockConn('\xff\x00'))
+        request = mock.MockRequest(
+            connection=mock.MockConn(b'\x88\x02\x03\xe8'))
         request.ws_resource = '/sub/plain?'
         request.ws_protocol = None
         dispatcher.transfer_data(request)
-        self.assertEqual('sub/plain_wsh.py is called for /sub/plain?, None'
-                         '\xff\x00',
-                         request.connection.written_data())
+        self.assertEqual(
+            b'sub/plain_wsh.py is called for /sub/plain?, None'
+            b'\x88\x02\x03\xe8', request.connection.written_data())
 
-        request = mock.MockRequest(connection=mock.MockConn('\xff\x00'))
+        request = mock.MockRequest(
+            connection=mock.MockConn(b'\x88\x02\x03\xe8'))
         request.ws_resource = '/sub/plain?q=v'
         request.ws_protocol = None
         dispatcher.transfer_data(request)
-        self.assertEqual('sub/plain_wsh.py is called for /sub/plain?q=v, None'
-                         '\xff\x00',
-                         request.connection.written_data())
+        self.assertEqual(
+            b'sub/plain_wsh.py is called for /sub/plain?q=v, None'
+            b'\x88\x02\x03\xe8', request.connection.written_data())
 
     def test_transfer_data_no_handler(self):
         dispatcher = dispatch.Dispatcher(_TEST_HANDLERS_DIR, None)
-        for resource in ['/blank', '/sub/non_callable',
-                         '/sub/no_wsh_at_the_end', '/does/not/exist']:
-            request = mock.MockRequest(connection=mock.MockConn(''))
+        for resource in [
+                '/blank', '/sub/non_callable', '/sub/no_wsh_at_the_end',
+                '/does/not/exist'
+        ]:
+            request = mock.MockRequest(connection=mock.MockConn(b''))
             request.ws_resource = resource
             request.ws_protocol = 'p2'
             try:
                 dispatcher.transfer_data(request)
                 self.fail()
             except dispatch.DispatchException as e:
-                self.failUnless(str(e).find('No handler') != -1)
+                self.assertTrue(str(e).find('No handler') != -1)
             except Exception:
                 self.fail()
 
     def test_transfer_data_handler_exception(self):
         dispatcher = dispatch.Dispatcher(_TEST_HANDLERS_DIR, None)
-        request = mock.MockRequest(connection=mock.MockConn(''))
+        request = mock.MockRequest(connection=mock.MockConn(b''))
         request.ws_resource = '/sub/exception_in_transfer'
         request.ws_protocol = 'p3'
         try:
             dispatcher.transfer_data(request)
             self.fail()
         except Exception as e:
-            self.failUnless(str(e).find('Intentional') != -1,
-                            'Unexpected exception: %s' % e)
+            self.assertTrue(
+                str(e).find('Intentional') != -1,
+                'Unexpected exception: %s' % e)
 
     def test_abort_transfer_data(self):
         dispatcher = dispatch.Dispatcher(_TEST_HANDLERS_DIR, None)
@@ -239,44 +249,45 @@ class DispatcherTest(unittest.TestCase):
     def test_scan_dir(self):
         disp = dispatch.Dispatcher(_TEST_HANDLERS_DIR, None)
         self.assertEqual(4, len(disp._handler_suite_map))
-        self.failUnless('/origin_check' in disp._handler_suite_map)
-        self.failUnless(
+        self.assertTrue('/origin_check' in disp._handler_suite_map)
+        self.assertTrue(
             '/sub/exception_in_transfer' in disp._handler_suite_map)
-        self.failUnless('/sub/plain' in disp._handler_suite_map)
+        self.assertTrue('/sub/plain' in disp._handler_suite_map)
 
     def test_scan_sub_dir(self):
         disp = dispatch.Dispatcher(_TEST_HANDLERS_DIR, _TEST_HANDLERS_SUB_DIR)
         self.assertEqual(2, len(disp._handler_suite_map))
-        self.failIf('/origin_check' in disp._handler_suite_map)
-        self.failUnless(
+        self.assertFalse('/origin_check' in disp._handler_suite_map)
+        self.assertTrue(
             '/sub/exception_in_transfer' in disp._handler_suite_map)
-        self.failUnless('/sub/plain' in disp._handler_suite_map)
+        self.assertTrue('/sub/plain' in disp._handler_suite_map)
 
     def test_scan_sub_dir_as_root(self):
         disp = dispatch.Dispatcher(_TEST_HANDLERS_SUB_DIR,
                                    _TEST_HANDLERS_SUB_DIR)
         self.assertEqual(2, len(disp._handler_suite_map))
-        self.failIf('/origin_check' in disp._handler_suite_map)
-        self.failIf('/sub/exception_in_transfer' in disp._handler_suite_map)
-        self.failIf('/sub/plain' in disp._handler_suite_map)
-        self.failUnless('/exception_in_transfer' in disp._handler_suite_map)
-        self.failUnless('/plain' in disp._handler_suite_map)
+        self.assertFalse('/origin_check' in disp._handler_suite_map)
+        self.assertFalse(
+            '/sub/exception_in_transfer' in disp._handler_suite_map)
+        self.assertFalse('/sub/plain' in disp._handler_suite_map)
+        self.assertTrue('/exception_in_transfer' in disp._handler_suite_map)
+        self.assertTrue('/plain' in disp._handler_suite_map)
 
     def test_scan_dir_must_under_root(self):
         dispatch.Dispatcher('a/b', 'a/b/c')  # OK
         dispatch.Dispatcher('a/b///', 'a/b')  # OK
-        self.assertRaises(dispatch.DispatchException,
-                          dispatch.Dispatcher, 'a/b/c', 'a/b')
+        self.assertRaises(dispatch.DispatchException, dispatch.Dispatcher,
+                          'a/b/c', 'a/b')
 
     def test_resource_path_alias(self):
         disp = dispatch.Dispatcher(_TEST_HANDLERS_DIR, None)
         disp.add_resource_path_alias('/', '/origin_check')
         self.assertEqual(5, len(disp._handler_suite_map))
-        self.failUnless('/origin_check' in disp._handler_suite_map)
-        self.failUnless(
+        self.assertTrue('/origin_check' in disp._handler_suite_map)
+        self.assertTrue(
             '/sub/exception_in_transfer' in disp._handler_suite_map)
-        self.failUnless('/sub/plain' in disp._handler_suite_map)
-        self.failUnless('/' in disp._handler_suite_map)
+        self.assertTrue('/sub/plain' in disp._handler_suite_map)
+        self.assertTrue('/' in disp._handler_suite_map)
         self.assertRaises(dispatch.DispatchException,
                           disp.add_resource_path_alias, '/alias', '/not-exist')
 
@@ -284,5 +295,4 @@ class DispatcherTest(unittest.TestCase):
 if __name__ == '__main__':
     unittest.main()
 
-
 # vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_endtoend.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_endtoend.py
similarity index 57%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/test/test_endtoend.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_endtoend.py
index 3680ec2eba6..445d29c67dd 100755
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_endtoend.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_endtoend.py
@@ -28,15 +28,10 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-"""End-to-end tests for pywebsocket. Tests standalone.py by default. You
-can also test mod_pywebsocket hosted on an Apache server by setting
-_use_external_server to True and modifying _external_server_port to point to
-the port on which the Apache server is running.
+"""End-to-end tests for pywebsocket. Tests standalone.py.
 """
 
-
+from __future__ import absolute_import
 import logging
 import os
 import signal
@@ -49,19 +44,12 @@ import unittest
 import set_sys_path  # Update sys.path to locate mod_pywebsocket module.
 
 from test import client_for_testing
-from test import mux_client_for_testing
-
 
 # Special message that tells the echo server to start closing handshake
 _GOODBYE_MESSAGE = 'Goodbye'
 
 _SERVER_WARMUP_IN_SEC = 0.2
 
-# If you want to use external server to run end to end tests, set following
-# parameters correctly.
-_use_external_server = False
-_external_server_port = 0
-
 
 # Test body functions
 def _echo_check_procedure(client):
@@ -81,10 +69,10 @@ def _echo_check_procedure(client):
 def _echo_check_procedure_with_binary(client):
     client.connect()
 
-    client.send_message('binary', binary=True)
-    client.assert_receive('binary', binary=True)
-    client.send_message('\x00\x80\xfe\xff\x00\x80', binary=True)
-    client.assert_receive('\x00\x80\xfe\xff\x00\x80', binary=True)
+    client.send_message(b'binary', binary=True)
+    client.assert_receive(b'binary', binary=True)
+    client.send_message(b'\x00\x80\xfe\xff\x00\x80', binary=True)
+    client.assert_receive(b'\x00\x80\xfe\xff\x00\x80', binary=True)
 
     client.send_close()
     client.assert_receive_close()
@@ -125,53 +113,18 @@ def _unmasked_frame_check_procedure(client):
     client.assert_connection_closed()
 
 
-def _mux_echo_check_procedure(mux_client):
-    mux_client.connect()
-    mux_client.send_flow_control(1, 1024)
-
-    logical_channel_options = client_for_testing.ClientOptions()
-    logical_channel_options.server_host = 'localhost'
-    logical_channel_options.server_port = 80
-    logical_channel_options.origin = 'http://localhost'
-    logical_channel_options.resource = '/echo'
-    mux_client.add_channel(2, logical_channel_options)
-    mux_client.send_flow_control(2, 1024)
-
-    mux_client.send_message(2, 'test')
-    mux_client.assert_receive(2, 'test')
-
-    mux_client.add_channel(3, logical_channel_options)
-    mux_client.send_flow_control(3, 1024)
-
-    mux_client.send_message(2, 'hello')
-    mux_client.send_message(3, 'world')
-    mux_client.assert_receive(2, 'hello')
-    mux_client.assert_receive(3, 'world')
-
-    # Don't send close message on channel id 1 so that server-initiated
-    # closing handshake won't occur.
-    mux_client.send_close(2)
-    mux_client.send_close(3)
-    mux_client.assert_receive_close(2)
-    mux_client.assert_receive_close(3)
-
-    mux_client.send_physical_connection_close()
-    mux_client.assert_physical_connection_receive_close()
-
-
 class EndToEndTestBase(unittest.TestCase):
     """Base class for end-to-end tests that launch pywebsocket standalone
     server as a separate process, connect to it using the client_for_testing
     module, and check if the server behaves correctly by exchanging opening
     handshake and frames over a TCP connection.
     """
-
     def setUp(self):
         self.server_stderr = None
         self.top_dir = os.path.join(os.path.split(__file__)[0], '..')
         os.putenv('PYTHONPATH', os.path.pathsep.join(sys.path))
-        self.standalone_command = os.path.join(
-            self.top_dir, 'mod_pywebsocket', 'standalone.py')
+        self.standalone_command = os.path.join(self.top_dir, 'mod_pywebsocket',
+                                               'standalone.py')
         self.document_root = os.path.join(self.top_dir, 'example')
         s = socket.socket()
         s.bind(('localhost', 0))
@@ -183,27 +136,23 @@ class EndToEndTestBase(unittest.TestCase):
         self._options.origin = 'http://localhost'
         self._options.resource = '/echo'
 
-        # TODO(toyoshim): Eliminate launching a standalone server on using
-        # external server.
-
-        if _use_external_server:
-            self._options.server_port = _external_server_port
-        else:
-            self._options.server_port = self.test_port
+        self._options.server_port = self.test_port
 
     # TODO(tyoshino): Use tearDown to kill the server.
 
     def _run_python_command(self, commandline, stdout=None, stderr=None):
-        return subprocess.Popen([sys.executable] + commandline, close_fds=True,
-                                stdout=stdout, stderr=stderr)
+        return subprocess.Popen([sys.executable] + commandline,
+                                close_fds=True,
+                                stdout=stdout,
+                                stderr=stderr)
 
     def _run_server(self):
-        args = [self.standalone_command,
-                '-H', 'localhost',
-                '-V', 'localhost',
-                '-p', str(self.test_port),
-                '-P', str(self.test_port),
-                '-d', self.document_root]
+        args = [
+            self.standalone_command, '-H', 'localhost', '-V', 'localhost',
+            '-p',
+            str(self.test_port), '-P',
+            str(self.test_port), '-d', self.document_root
+        ]
 
         # Inherit the level set to the root logger by test runner.
         root_logger = logging.getLogger()
@@ -212,15 +161,26 @@ class EndToEndTestBase(unittest.TestCase):
             args.append('--log-level')
             args.append(logging.getLevelName(log_level).lower())
 
-        return self._run_python_command(args,
-                                        stderr=self.server_stderr)
+        return self._run_python_command(args, stderr=self.server_stderr)
 
-    def _kill_process(self, pid):
-        if sys.platform in ('win32', 'cygwin'):
-            subprocess.call(
-                ('taskkill.exe', '/f', '/pid', str(pid)), close_fds=True)
-        else:
-            os.kill(pid, signal.SIGKILL)
+    def _close_server(self, server):
+        """
+
+        This method mimics Popen.__exit__ to gracefully kill the server process.
+        Its main purpose is to maintain comptaibility between python 2 and 3,
+        since Popen in python 2 does not have __exit__ attribute.
+
+        """
+        server.kill()
+
+        if server.stdout:
+            server.stdout.close()
+        if server.stderr:
+            server.stderr.close()
+        if server.stdin:
+            server.stdin.close()
+
+        server.wait()
 
 
 class EndToEndHyBiTest(EndToEndTestBase):
@@ -240,27 +200,13 @@ class EndToEndHyBiTest(EndToEndTestBase):
             finally:
                 client.close_socket()
         finally:
-            self._kill_process(server.pid)
+            self._close_server(server)
 
     def _run_test(self, test_function):
         self._run_test_with_client_options(test_function, self._options)
 
-    def _run_deflate_frame_test(self, test_function):
-        server = self._run_server()
-        try:
-            time.sleep(_SERVER_WARMUP_IN_SEC)
-
-            self._options.enable_deflate_frame()
-            client = client_for_testing.create_client(self._options)
-            try:
-                test_function(client)
-            finally:
-                client.close_socket()
-        finally:
-            self._kill_process(server.pid)
-
-    def _run_permessage_deflate_test(
-            self, offer, response_checker, test_function):
+    def _run_permessage_deflate_test(self, offer, response_checker,
+                                     test_function):
         server = self._run_server()
         try:
             time.sleep(_SERVER_WARMUP_IN_SEC)
@@ -279,10 +225,10 @@ class EndToEndHyBiTest(EndToEndTestBase):
             finally:
                 client.close_socket()
         finally:
-            self._kill_process(server.pid)
+            self._close_server(server)
 
     def _run_close_with_code_and_reason_test(self, test_function, code,
-                                                  reason):
+                                             reason):
         server = self._run_server()
         try:
             time.sleep(_SERVER_WARMUP_IN_SEC)
@@ -293,7 +239,7 @@ class EndToEndHyBiTest(EndToEndTestBase):
             finally:
                 client.close_socket()
         finally:
-            self._kill_process(server.pid)
+            self._close_server(server)
 
     def _run_http_fallback_test(self, options, status):
         server = self._run_server()
@@ -311,20 +257,7 @@ class EndToEndHyBiTest(EndToEndTestBase):
             finally:
                 client.close_socket()
         finally:
-            self._kill_process(server.pid)
-
-    def _run_mux_test(self, test_function):
-        server = self._run_server()
-        try:
-            time.sleep(_SERVER_WARMUP_IN_SEC)
-
-            client = mux_client_for_testing.MuxClient(self._options)
-            try:
-                test_function(client)
-            finally:
-                client.close_socket()
-        finally:
-            self._kill_process(server.pid)
+            self._close_server(server)
 
     def test_echo(self):
         self._run_test(_echo_check_procedure)
@@ -338,183 +271,158 @@ class EndToEndHyBiTest(EndToEndTestBase):
     def test_unmasked_frame(self):
         self._run_test(_unmasked_frame_check_procedure)
 
-    def test_echo_deflate_frame(self):
-        self._run_deflate_frame_test(_echo_check_procedure)
-
-    def test_echo_deflate_frame_server_close(self):
-        self._run_deflate_frame_test(
-            _echo_check_procedure_with_goodbye)
-
     def test_echo_permessage_deflate(self):
         def test_function(client):
             # From the examples in the spec.
-            compressed_hello = '\xf2\x48\xcd\xc9\xc9\x07\x00'
-            client._stream.send_data(
-                    compressed_hello,
-                    client_for_testing.OPCODE_TEXT,
-                    rsv1=1)
+            compressed_hello = b'\xf2\x48\xcd\xc9\xc9\x07\x00'
+            client._stream.send_data(compressed_hello,
+                                     client_for_testing.OPCODE_TEXT,
+                                     rsv1=1)
             client._stream.assert_receive_binary(
-                    compressed_hello,
-                    opcode=client_for_testing.OPCODE_TEXT,
-                    rsv1=1)
+                compressed_hello,
+                opcode=client_for_testing.OPCODE_TEXT,
+                rsv1=1)
 
             client.send_close()
             client.assert_receive_close()
 
         def response_checker(parameter):
-            self.assertEquals('permessage-deflate', parameter.name())
-            self.assertEquals([], parameter.get_parameters())
+            self.assertEqual('permessage-deflate', parameter.name())
+            self.assertEqual([], parameter.get_parameters())
 
-        self._run_permessage_deflate_test(
-                ['permessage-deflate'],
-                response_checker,
-                test_function)
+        self._run_permessage_deflate_test(['permessage-deflate'],
+                                          response_checker, test_function)
 
     def test_echo_permessage_deflate_two_frames(self):
         def test_function(client):
             # From the examples in the spec.
-            client._stream.send_data(
-                    '\xf2\x48\xcd',
-                    client_for_testing.OPCODE_TEXT,
-                    end=False,
-                    rsv1=1)
-            client._stream.send_data(
-                    '\xc9\xc9\x07\x00',
-                    client_for_testing.OPCODE_TEXT)
+            client._stream.send_data(b'\xf2\x48\xcd',
+                                     client_for_testing.OPCODE_TEXT,
+                                     end=False,
+                                     rsv1=1)
+            client._stream.send_data(b'\xc9\xc9\x07\x00',
+                                     client_for_testing.OPCODE_TEXT)
             client._stream.assert_receive_binary(
-                    '\xf2\x48\xcd\xc9\xc9\x07\x00',
-                    opcode=client_for_testing.OPCODE_TEXT,
-                    rsv1=1)
+                b'\xf2\x48\xcd\xc9\xc9\x07\x00',
+                opcode=client_for_testing.OPCODE_TEXT,
+                rsv1=1)
 
             client.send_close()
             client.assert_receive_close()
 
         def response_checker(parameter):
-            self.assertEquals('permessage-deflate', parameter.name())
-            self.assertEquals([], parameter.get_parameters())
+            self.assertEqual('permessage-deflate', parameter.name())
+            self.assertEqual([], parameter.get_parameters())
 
-        self._run_permessage_deflate_test(
-                ['permessage-deflate'],
-                response_checker,
-                test_function)
+        self._run_permessage_deflate_test(['permessage-deflate'],
+                                          response_checker, test_function)
 
     def test_echo_permessage_deflate_two_messages(self):
         def test_function(client):
             # From the examples in the spec.
-            client._stream.send_data(
-                    '\xf2\x48\xcd\xc9\xc9\x07\x00',
-                    client_for_testing.OPCODE_TEXT,
-                    rsv1=1)
-            client._stream.send_data(
-                    '\xf2\x00\x11\x00\x00',
-                    client_for_testing.OPCODE_TEXT,
-                    rsv1=1)
+            client._stream.send_data(b'\xf2\x48\xcd\xc9\xc9\x07\x00',
+                                     client_for_testing.OPCODE_TEXT,
+                                     rsv1=1)
+            client._stream.send_data(b'\xf2\x00\x11\x00\x00',
+                                     client_for_testing.OPCODE_TEXT,
+                                     rsv1=1)
             client._stream.assert_receive_binary(
-                    '\xf2\x48\xcd\xc9\xc9\x07\x00',
-                    opcode=client_for_testing.OPCODE_TEXT,
-                    rsv1=1)
+                b'\xf2\x48\xcd\xc9\xc9\x07\x00',
+                opcode=client_for_testing.OPCODE_TEXT,
+                rsv1=1)
             client._stream.assert_receive_binary(
-                    '\xf2\x00\x11\x00\x00',
-                    opcode=client_for_testing.OPCODE_TEXT,
-                    rsv1=1)
+                b'\xf2\x00\x11\x00\x00',
+                opcode=client_for_testing.OPCODE_TEXT,
+                rsv1=1)
 
             client.send_close()
             client.assert_receive_close()
 
         def response_checker(parameter):
-            self.assertEquals('permessage-deflate', parameter.name())
-            self.assertEquals([], parameter.get_parameters())
+            self.assertEqual('permessage-deflate', parameter.name())
+            self.assertEqual([], parameter.get_parameters())
 
-        self._run_permessage_deflate_test(
-                ['permessage-deflate'],
-                response_checker,
-                test_function)
+        self._run_permessage_deflate_test(['permessage-deflate'],
+                                          response_checker, test_function)
 
     def test_echo_permessage_deflate_two_msgs_server_no_context_takeover(self):
         def test_function(client):
             # From the examples in the spec.
-            client._stream.send_data(
-                    '\xf2\x48\xcd\xc9\xc9\x07\x00',
-                    client_for_testing.OPCODE_TEXT,
-                    rsv1=1)
-            client._stream.send_data(
-                    '\xf2\x00\x11\x00\x00',
-                    client_for_testing.OPCODE_TEXT,
-                    rsv1=1)
+            client._stream.send_data(b'\xf2\x48\xcd\xc9\xc9\x07\x00',
+                                     client_for_testing.OPCODE_TEXT,
+                                     rsv1=1)
+            client._stream.send_data(b'\xf2\x00\x11\x00\x00',
+                                     client_for_testing.OPCODE_TEXT,
+                                     rsv1=1)
             client._stream.assert_receive_binary(
-                    '\xf2\x48\xcd\xc9\xc9\x07\x00',
-                    opcode=client_for_testing.OPCODE_TEXT,
-                    rsv1=1)
+                b'\xf2\x48\xcd\xc9\xc9\x07\x00',
+                opcode=client_for_testing.OPCODE_TEXT,
+                rsv1=1)
             client._stream.assert_receive_binary(
-                    '\xf2\x48\xcd\xc9\xc9\x07\x00',
-                    opcode=client_for_testing.OPCODE_TEXT,
-                    rsv1=1)
+                b'\xf2\x48\xcd\xc9\xc9\x07\x00',
+                opcode=client_for_testing.OPCODE_TEXT,
+                rsv1=1)
 
             client.send_close()
             client.assert_receive_close()
 
         def response_checker(parameter):
-            self.assertEquals('permessage-deflate', parameter.name())
-            self.assertEquals([('server_no_context_takeover', None)],
-                              parameter.get_parameters())
+            self.assertEqual('permessage-deflate', parameter.name())
+            self.assertEqual([('server_no_context_takeover', None)],
+                             parameter.get_parameters())
 
         self._run_permessage_deflate_test(
-                ['permessage-deflate; server_no_context_takeover'],
-                response_checker,
-                test_function)
+            ['permessage-deflate; server_no_context_takeover'],
+            response_checker, test_function)
 
     def test_echo_permessage_deflate_preference(self):
         def test_function(client):
             # From the examples in the spec.
-            compressed_hello = '\xf2\x48\xcd\xc9\xc9\x07\x00'
-            client._stream.send_data(
-                    compressed_hello,
-                    client_for_testing.OPCODE_TEXT,
-                    rsv1=1)
+            compressed_hello = b'\xf2\x48\xcd\xc9\xc9\x07\x00'
+            client._stream.send_data(compressed_hello,
+                                     client_for_testing.OPCODE_TEXT,
+                                     rsv1=1)
             client._stream.assert_receive_binary(
-                    compressed_hello,
-                    opcode=client_for_testing.OPCODE_TEXT,
-                    rsv1=1)
+                compressed_hello,
+                opcode=client_for_testing.OPCODE_TEXT,
+                rsv1=1)
 
             client.send_close()
             client.assert_receive_close()
 
         def response_checker(parameter):
-            self.assertEquals('permessage-deflate', parameter.name())
-            self.assertEquals([], parameter.get_parameters())
+            self.assertEqual('permessage-deflate', parameter.name())
+            self.assertEqual([], parameter.get_parameters())
 
         self._run_permessage_deflate_test(
-                ['permessage-deflate', 'deflate-frame'],
-                response_checker,
-                test_function)
+            ['permessage-deflate', 'deflate-frame'], response_checker,
+            test_function)
 
     def test_echo_permessage_deflate_with_parameters(self):
         def test_function(client):
             # From the examples in the spec.
-            compressed_hello = '\xf2\x48\xcd\xc9\xc9\x07\x00'
-            client._stream.send_data(
-                    compressed_hello,
-                    client_for_testing.OPCODE_TEXT,
-                    rsv1=1)
+            compressed_hello = b'\xf2\x48\xcd\xc9\xc9\x07\x00'
+            client._stream.send_data(compressed_hello,
+                                     client_for_testing.OPCODE_TEXT,
+                                     rsv1=1)
             client._stream.assert_receive_binary(
-                    compressed_hello,
-                    opcode=client_for_testing.OPCODE_TEXT,
-                    rsv1=1)
+                compressed_hello,
+                opcode=client_for_testing.OPCODE_TEXT,
+                rsv1=1)
 
             client.send_close()
             client.assert_receive_close()
 
         def response_checker(parameter):
-            self.assertEquals('permessage-deflate', parameter.name())
-            self.assertEquals([('server_max_window_bits', '10'),
-                               ('server_no_context_takeover', None)],
-                              parameter.get_parameters())
+            self.assertEqual('permessage-deflate', parameter.name())
+            self.assertEqual([('server_max_window_bits', '10'),
+                              ('server_no_context_takeover', None)],
+                             parameter.get_parameters())
 
-        self._run_permessage_deflate_test(
-                ['permessage-deflate; server_max_window_bits=10; '
-                 'server_no_context_takeover'],
-                response_checker,
-                test_function)
+        self._run_permessage_deflate_test([
+            'permessage-deflate; server_max_window_bits=10; '
+            'server_no_context_takeover'
+        ], response_checker, test_function)
 
     def test_echo_permessage_deflate_with_bad_server_max_window_bits(self):
         def test_function(client):
@@ -525,9 +433,8 @@ class EndToEndHyBiTest(EndToEndTestBase):
             raise Exception('Unexpected acceptance of permessage-deflate')
 
         self._run_permessage_deflate_test(
-                ['permessage-deflate; server_max_window_bits=3000000'],
-                response_checker,
-                test_function)
+            ['permessage-deflate; server_max_window_bits=3000000'],
+            response_checker, test_function)
 
     def test_echo_permessage_deflate_with_bad_server_max_window_bits(self):
         def test_function(client):
@@ -538,9 +445,8 @@ class EndToEndHyBiTest(EndToEndTestBase):
             raise Exception('Unexpected acceptance of permessage-deflate')
 
         self._run_permessage_deflate_test(
-                ['permessage-deflate; server_max_window_bits=3000000'],
-                response_checker,
-                test_function)
+            ['permessage-deflate; server_max_window_bits=3000000'],
+            response_checker, test_function)
 
     def test_echo_permessage_deflate_with_undefined_parameter(self):
         def test_function(client):
@@ -550,10 +456,8 @@ class EndToEndHyBiTest(EndToEndTestBase):
         def response_checker(parameter):
             raise Exception('Unexpected acceptance of permessage-deflate')
 
-        self._run_permessage_deflate_test(
-                ['permessage-deflate; foo=bar'],
-                response_checker,
-                test_function)
+        self._run_permessage_deflate_test(['permessage-deflate; foo=bar'],
+                                          response_checker, test_function)
 
     def test_echo_close_with_code_and_reason(self):
         self._options.resource = '/close'
@@ -565,20 +469,16 @@ class EndToEndHyBiTest(EndToEndTestBase):
         self._run_close_with_code_and_reason_test(
             _echo_check_procedure_with_code_and_reason, None, '')
 
-    def test_mux_echo(self):
-        self._run_mux_test(_mux_echo_check_procedure)
-
     def test_close_on_protocol_error(self):
         """Tests that the server sends a close frame with protocol error status
         code when the client sends data with some protocol error.
         """
-
         def test_function(client):
             client.connect()
 
             # Intermediate frame without any preceding start of fragmentation
             # frame.
-            client.send_frame_of_arbitrary_bytes('\x80\x80', '')
+            client.send_frame_of_arbitrary_bytes(b'\x80\x80', '')
             client.assert_receive_close(
                 client_for_testing.STATUS_PROTOCOL_ERROR)
 
@@ -589,12 +489,11 @@ class EndToEndHyBiTest(EndToEndTestBase):
         status code when the client sends data asking some operation that is
         not supported by the server.
         """
-
         def test_function(client):
             client.connect()
 
             # Text frame with RSV3 bit raised.
-            client.send_frame_of_arbitrary_bytes('\x91\x80', '')
+            client.send_frame_of_arbitrary_bytes(b'\x91\x80', '')
             client.assert_receive_close(
                 client_for_testing.STATUS_UNSUPPORTED_DATA)
 
@@ -605,12 +504,11 @@ class EndToEndHyBiTest(EndToEndTestBase):
         data status code when the client sends an invalid frame like containing
         invalid UTF-8 character.
         """
-
         def test_function(client):
             client.connect()
 
             # Text frame with invalid UTF-8 string.
-            client.send_message('\x80', raw=True)
+            client.send_message(b'\x80', raw=True)
             client.assert_receive_close(
                 client_for_testing.STATUS_INVALID_FRAME_PAYLOAD_DATA)
 
@@ -659,36 +557,12 @@ class EndToEndHyBiTest(EndToEndTestBase):
         self._run_http_fallback_test(options, 400)
 
 
-class EndToEndHyBi00Test(EndToEndTestBase):
-    def setUp(self):
-        EndToEndTestBase.setUp(self)
-
-    def _run_test(self, test_function):
-        server = self._run_server()
-        try:
-            time.sleep(_SERVER_WARMUP_IN_SEC)
-
-            client = client_for_testing.create_client_hybi00(self._options)
-            try:
-                test_function(client)
-            finally:
-                client.close_socket()
-        finally:
-            self._kill_process(server.pid)
-
-    def test_echo(self):
-        self._run_test(_echo_check_procedure)
-
-    def test_echo_server_close(self):
-        self._run_test(_echo_check_procedure_with_goodbye)
-
-
 class EndToEndTestWithEchoClient(EndToEndTestBase):
     def setUp(self):
         EndToEndTestBase.setUp(self)
 
-    def _check_example_echo_client_result(
-        self, expected, stdoutdata, stderrdata):
+    def _check_example_echo_client_result(self, expected, stdoutdata,
+                                          stderrdata):
         actual = stdoutdata.decode("utf-8")
         if actual != expected:
             raise Exception('Unexpected result on example echo client: '
@@ -705,49 +579,52 @@ class EndToEndTestWithEchoClient(EndToEndTestBase):
         try:
             time.sleep(_SERVER_WARMUP_IN_SEC)
 
-            client_command = os.path.join(
-                self.top_dir, 'example', 'echo_client.py')
+            client_command = os.path.join(self.top_dir, 'example',
+                                          'echo_client.py')
 
             # Expected output for the default messages.
-            default_expectation = ('Send: Hello\n' 'Recv: Hello\n'
-                u'Send: \u65e5\u672c\n' u'Recv: \u65e5\u672c\n'
-                'Send close\n' 'Recv ack\n')
+            default_expectation = (u'Send: Hello\n'
+                                   u'Recv: Hello\n'
+                                   u'Send: \u65e5\u672c\n'
+                                   u'Recv: \u65e5\u672c\n'
+                                   u'Send close\n'
+                                   u'Recv ack\n')
 
-            args = [client_command,
-                    '-p', str(self._options.server_port)]
+            args = [client_command, '-p', str(self._options.server_port)]
             client = self._run_python_command(args, stdout=subprocess.PIPE)
             stdoutdata, stderrdata = client.communicate()
-            self._check_example_echo_client_result(
-                    default_expectation, stdoutdata, stderrdata)
+            self._check_example_echo_client_result(default_expectation,
+                                                   stdoutdata, stderrdata)
 
             # Process a big message for which extended payload length is used.
             # To handle extended payload length, ws_version attribute will be
             # accessed. This test checks that ws_version is correctly set.
             big_message = 'a' * 1024
-            args = [client_command,
-                    '-p', str(self._options.server_port),
-                    '-m', big_message]
+            args = [
+                client_command, '-p',
+                str(self._options.server_port), '-m', big_message
+            ]
             client = self._run_python_command(args, stdout=subprocess.PIPE)
             stdoutdata, stderrdata = client.communicate()
             expected = ('Send: %s\nRecv: %s\nSend close\nRecv ack\n' %
                         (big_message, big_message))
-            self._check_example_echo_client_result(
-                expected, stdoutdata, stderrdata)
+            self._check_example_echo_client_result(expected, stdoutdata,
+                                                   stderrdata)
 
             # Test the permessage-deflate extension.
-            args = [client_command,
-                    '-p', str(self._options.server_port),
-                    '--use_permessage_deflate']
+            args = [
+                client_command, '-p',
+                str(self._options.server_port), '--use_permessage_deflate'
+            ]
             client = self._run_python_command(args, stdout=subprocess.PIPE)
             stdoutdata, stderrdata = client.communicate()
-            self._check_example_echo_client_result(
-                    default_expectation, stdoutdata, stderrdata)
+            self._check_example_echo_client_result(default_expectation,
+                                                   stdoutdata, stderrdata)
         finally:
-            self._kill_process(server.pid)
+            self._close_server(server)
 
 
 if __name__ == '__main__':
     unittest.main()
 
-
 # vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_extensions.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_extensions.py
similarity index 69%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/test/test_extensions.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_extensions.py
index 94a4384792b..39a111888be 100755
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_extensions.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_extensions.py
@@ -28,11 +28,9 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 """Tests for extensions module."""
 
-
+from __future__ import absolute_import
 import unittest
 import zlib
 
@@ -44,7 +42,6 @@ from mod_pywebsocket import extensions
 
 class ExtensionsTest(unittest.TestCase):
     """A unittest for non-class methods in extensions.py"""
-
     def test_parse_window_bits(self):
         self.assertRaises(ValueError, extensions._parse_window_bits, None)
         self.assertRaises(ValueError, extensions._parse_window_bits, 'foobar')
@@ -65,99 +62,17 @@ class ExtensionsTest(unittest.TestCase):
         self.assertRaises(ValueError, extensions._parse_window_bits, '7')
 
         self.assertRaises(ValueError, extensions._parse_window_bits, '16')
-        self.assertRaises(
-                ValueError, extensions._parse_window_bits, '10000000')
-
-
-class DeflateFrameExtensionProcessorParsingTest(unittest.TestCase):
-    """A unittest for checking that DeflateFrameExtensionProcessor parses given
-    extension parameter correctly.
-    """
-
-    def test_registry(self):
-        processor = extensions.get_extension_processor(
-                common.ExtensionParameter('deflate-frame'))
-        self.assertIsInstance(processor,
-                              extensions.DeflateFrameExtensionProcessor)
-
-        processor = extensions.get_extension_processor(
-                common.ExtensionParameter('x-webkit-deflate-frame'))
-        self.assertIsInstance(processor,
-                              extensions.DeflateFrameExtensionProcessor)
-
-    def test_minimal_offer(self):
-        processor = extensions.DeflateFrameExtensionProcessor(
-            common.ExtensionParameter('perframe-deflate'))
-
-        response = processor.get_extension_response()
-        self.assertEqual('perframe-deflate', response.name())
-        self.assertEqual(0, len(response.get_parameters()))
-
-        self.assertEqual(zlib.MAX_WBITS,
-                         processor._rfc1979_deflater._window_bits)
-        self.assertFalse(processor._rfc1979_deflater._no_context_takeover)
-
-    def test_offer_with_max_window_bits(self):
-        parameter = common.ExtensionParameter('perframe-deflate')
-        parameter.add_parameter('max_window_bits', '10')
-        processor = extensions.DeflateFrameExtensionProcessor(parameter)
-
-        response = processor.get_extension_response()
-        self.assertEqual('perframe-deflate', response.name())
-        self.assertEqual(0, len(response.get_parameters()))
-
-        self.assertEqual(10, processor._rfc1979_deflater._window_bits)
-
-    def test_offer_with_out_of_range_max_window_bits(self):
-        parameter = common.ExtensionParameter('perframe-deflate')
-        parameter.add_parameter('max_window_bits', '0')
-        processor = extensions.DeflateFrameExtensionProcessor(parameter)
-
-        self.assertIsNone(processor.get_extension_response())
-
-    def test_offer_with_max_window_bits_without_value(self):
-        parameter = common.ExtensionParameter('perframe-deflate')
-        parameter.add_parameter('max_window_bits', None)
-        processor = extensions.DeflateFrameExtensionProcessor(parameter)
-
-        self.assertIsNone(processor.get_extension_response())
-
-    def test_offer_with_no_context_takeover(self):
-        parameter = common.ExtensionParameter('perframe-deflate')
-        parameter.add_parameter('no_context_takeover', None)
-        processor = extensions.DeflateFrameExtensionProcessor(parameter)
-
-        response = processor.get_extension_response()
-        self.assertEqual('perframe-deflate', response.name())
-        self.assertEqual(0, len(response.get_parameters()))
-
-        self.assertTrue(processor._rfc1979_deflater._no_context_takeover)
-
-    def test_offer_with_no_context_takeover_with_value(self):
-        parameter = common.ExtensionParameter('perframe-deflate')
-        parameter.add_parameter('no_context_takeover', 'foobar')
-        processor = extensions.DeflateFrameExtensionProcessor(parameter)
-
-        self.assertIsNone(processor.get_extension_response())
-
-    def test_offer_with_unknown_parameter(self):
-        parameter = common.ExtensionParameter('perframe-deflate')
-        parameter.add_parameter('foo', 'bar')
-        processor = extensions.DeflateFrameExtensionProcessor(parameter)
-
-        response = processor.get_extension_response()
-        self.assertEqual('perframe-deflate', response.name())
-        self.assertEqual(0, len(response.get_parameters()))
+        self.assertRaises(ValueError, extensions._parse_window_bits,
+                          '10000000')
 
 
 class PerMessageDeflateExtensionProcessorParsingTest(unittest.TestCase):
     """A unittest for checking that PerMessageDeflateExtensionProcessor parses
     given extension parameter correctly.
     """
-
     def test_registry(self):
         processor = extensions.get_extension_processor(
-                common.ExtensionParameter('permessage-deflate'))
+            common.ExtensionParameter('permessage-deflate'))
         self.assertIsInstance(processor,
                               extensions.PerMessageDeflateExtensionProcessor)
 
@@ -230,7 +145,6 @@ class PerMessageDeflateExtensionProcessorBuildingTest(unittest.TestCase):
     """A unittest for checking that PerMessageDeflateExtensionProcessor builds
     a response based on specified options correctly.
     """
-
     def test_response_with_max_window_bits(self):
         parameter = common.ExtensionParameter('permessage-deflate')
         parameter.add_parameter('client_max_window_bits', None)
@@ -275,5 +189,4 @@ class PerMessageDeflateExtensionProcessorBuildingTest(unittest.TestCase):
 if __name__ == '__main__':
     unittest.main()
 
-
 # vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_handshake.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_handshake.py
similarity index 78%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/test/test_handshake.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_handshake.py
index aa78ac05e58..e0e2278dfe6 100755
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_handshake.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_handshake.py
@@ -28,11 +28,9 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 """Tests for handshake._base module."""
 
-
+from __future__ import absolute_import
 import unittest
 
 import set_sys_path  # Update sys.path to locate mod_pywebsocket module.
@@ -47,7 +45,6 @@ from mod_pywebsocket.handshake._base import validate_subprotocol
 
 class ValidateSubprotocolTest(unittest.TestCase):
     """A unittest for validate_subprotocol method."""
-
     def test_validate_subprotocol(self):
         # Should succeed.
         validate_subprotocol('sample')
@@ -55,25 +52,20 @@ class ValidateSubprotocolTest(unittest.TestCase):
         validate_subprotocol('sample\x7eprotocol')
 
         # Should fail.
-        self.assertRaises(HandshakeException,
-                          validate_subprotocol,
-                          '')
-        self.assertRaises(HandshakeException,
-                          validate_subprotocol,
+        self.assertRaises(HandshakeException, validate_subprotocol, '')
+        self.assertRaises(HandshakeException, validate_subprotocol,
                           'sample\x09protocol')
-        self.assertRaises(HandshakeException,
-                          validate_subprotocol,
+        self.assertRaises(HandshakeException, validate_subprotocol,
                           'sample\x19protocol')
-        self.assertRaises(HandshakeException,
-                          validate_subprotocol,
+        self.assertRaises(HandshakeException, validate_subprotocol,
                           'sample\x20protocol')
-        self.assertRaises(HandshakeException,
-                          validate_subprotocol,
+        self.assertRaises(HandshakeException, validate_subprotocol,
                           'sample\x7fprotocol')
-        self.assertRaises(HandshakeException,
-                          validate_subprotocol,
-                          # "Japan" in Japanese
-                          u'\u65e5\u672c')
+        self.assertRaises(
+            HandshakeException,
+            validate_subprotocol,
+            # "Japan" in Japanese
+            u'\u65e5\u672c')
 
 
 _TEST_TOKEN_EXTENSION_DATA = [
@@ -81,12 +73,10 @@ _TEST_TOKEN_EXTENSION_DATA = [
     ('foo; bar', [('foo', [('bar', None)])]),
     ('foo; bar=baz', [('foo', [('bar', 'baz')])]),
     ('foo; bar=baz; car=cdr', [('foo', [('bar', 'baz'), ('car', 'cdr')])]),
-    ('foo; bar=baz, car; cdr',
-     [('foo', [('bar', 'baz')]), ('car', [('cdr', None)])]),
-    ('a, b, c, d',
-     [('a', []), ('b', []), ('c', []), ('d', [])]),
-    ]
-
+    ('foo; bar=baz, car; cdr', [('foo', [('bar', 'baz')]),
+                                ('car', [('cdr', None)])]),
+    ('a, b, c, d', [('a', []), ('b', []), ('c', []), ('d', [])]),
+]
 
 _TEST_QUOTED_EXTENSION_DATA = [
     ('foo; bar=""', [('foo', [('bar', '')])]),
@@ -95,8 +85,7 @@ _TEST_QUOTED_EXTENSION_DATA = [
     ('foo; bar="\\\r\\\nbaz"', [('foo', [('bar', '\r\nbaz')])]),
     ('foo; bar="\\"baz"', [('foo', [('bar', '"baz')])]),
     ('foo; bar="\xbbbaz"', [('foo', [('bar', '\xbbbaz')])]),
-    ]
-
+]
 
 _TEST_REDUNDANT_TOKEN_EXTENSION_DATA = [
     ('foo \t ', [('foo', [])]),
@@ -104,16 +93,14 @@ _TEST_REDUNDANT_TOKEN_EXTENSION_DATA = [
     ('foo; bar=\r\n \r\n baz', [('foo', [('bar', 'baz')])]),
     ('foo ;bar = baz ', [('foo', [('bar', 'baz')])]),
     ('foo,bar,,baz', [('foo', []), ('bar', []), ('baz', [])]),
-    ]
-
+]
 
 _TEST_REDUNDANT_QUOTED_EXTENSION_DATA = [
     ('foo; bar="\r\n \r\n baz"', [('foo', [('bar', '  baz')])]),
-    ]
+]
 
 
 class ExtensionsParserTest(unittest.TestCase):
-
     def _verify_extension_list(self, expected_list, actual_list):
         """Verifies that ExtensionParameter objects in actual_list have the
         same members as extension definitions in expected_list. Extension
@@ -129,25 +116,25 @@ class ExtensionsParserTest(unittest.TestCase):
 
     def test_parse(self):
         for formatted_string, definition in _TEST_TOKEN_EXTENSION_DATA:
-            self._verify_extension_list(
-                definition, parse_extensions(formatted_string))
+            self._verify_extension_list(definition,
+                                        parse_extensions(formatted_string))
 
     def test_parse_quoted_data(self):
         for formatted_string, definition in _TEST_QUOTED_EXTENSION_DATA:
-            self._verify_extension_list(
-                definition, parse_extensions(formatted_string))
+            self._verify_extension_list(definition,
+                                        parse_extensions(formatted_string))
 
     def test_parse_redundant_data(self):
         for (formatted_string,
              definition) in _TEST_REDUNDANT_TOKEN_EXTENSION_DATA:
-            self._verify_extension_list(
-                definition, parse_extensions(formatted_string))
+            self._verify_extension_list(definition,
+                                        parse_extensions(formatted_string))
 
     def test_parse_redundant_quoted_data(self):
         for (formatted_string,
              definition) in _TEST_REDUNDANT_QUOTED_EXTENSION_DATA:
-            self._verify_extension_list(
-                definition, parse_extensions(formatted_string))
+            self._verify_extension_list(definition,
+                                        parse_extensions(formatted_string))
 
     def test_parse_bad_data(self):
         _TEST_BAD_EXTENSION_DATA = [
@@ -160,15 +147,14 @@ class ExtensionsParserTest(unittest.TestCase):
             ('foo; bar="a\r"'),
             ('foo; bar="\\\xff"'),
             ('foo; bar=\ra'),
-            ]
+        ]
 
         for formatted_string in _TEST_BAD_EXTENSION_DATA:
-            self.assertRaises(
-                ExtensionParsingException, parse_extensions, formatted_string)
+            self.assertRaises(ExtensionParsingException, parse_extensions,
+                              formatted_string)
 
 
 class FormatExtensionsTest(unittest.TestCase):
-
     def test_format_extensions(self):
         for formatted_string, definitions in _TEST_TOKEN_EXTENSION_DATA:
             extensions = []
@@ -177,12 +163,10 @@ class FormatExtensionsTest(unittest.TestCase):
                 extension = ExtensionParameter(name)
                 extension._parameters = parameters
                 extensions.append(extension)
-            self.assertEqual(
-                formatted_string, format_extensions(extensions))
+            self.assertEqual(formatted_string, format_extensions(extensions))
 
 
 if __name__ == '__main__':
     unittest.main()
 
-
 # vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_handshake_hybi.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_handshake_hybi.py
similarity index 62%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/test/test_handshake_hybi.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_handshake_hybi.py
index d0aaf640a58..04841f1f79f 100755
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_handshake_hybi.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_handshake_hybi.py
@@ -28,11 +28,9 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 """Tests for handshake module."""
 
-
+from __future__ import absolute_import
 import unittest
 
 import set_sys_path  # Update sys.path to locate mod_pywebsocket module.
@@ -42,14 +40,13 @@ from mod_pywebsocket.handshake._base import HandshakeException
 from mod_pywebsocket.handshake._base import VersionException
 from mod_pywebsocket.handshake.hybi import Handshaker
 
-import mock
+from test import mock
 
 
 class RequestDefinition(object):
     """A class for holding data for constructing opening handshake strings for
     testing the opening handshake processor.
     """
-
     def __init__(self, method, uri, headers):
         self.method = method
         self.uri = uri
@@ -58,22 +55,22 @@ class RequestDefinition(object):
 
 def _create_good_request_def():
     return RequestDefinition(
-        'GET', '/demo',
-        {'Host': 'server.example.com',
-         'Upgrade': 'websocket',
-         'Connection': 'Upgrade',
-         'Sec-WebSocket-Key': 'dGhlIHNhbXBsZSBub25jZQ==',
-         'Sec-WebSocket-Version': '13',
-         'Origin': 'http://example.com'})
+        'GET', '/demo', {
+            'Host': 'server.example.com',
+            'Upgrade': 'websocket',
+            'Connection': 'Upgrade',
+            'Sec-WebSocket-Key': 'dGhlIHNhbXBsZSBub25jZQ==',
+            'Sec-WebSocket-Version': '13',
+            'Origin': 'http://example.com'
+        })
 
 
 def _create_request(request_def):
-    conn = mock.MockConn('')
-    return mock.MockRequest(
-        method=request_def.method,
-        uri=request_def.uri,
-        headers_in=request_def.headers,
-        connection=conn)
+    conn = mock.MockConn(b'')
+    return mock.MockRequest(method=request_def.method,
+                            uri=request_def.uri,
+                            headers_in=request_def.headers,
+                            connection=conn)
 
 
 def _create_handshaker(request):
@@ -86,7 +83,6 @@ class SubprotocolChoosingDispatcher(object):
     of requested ones to ws_protocol where i is given on construction as index
     argument. If index is negative, default_value will be set to ws_protocol.
     """
-
     def __init__(self, index, default_value=None):
         self.index = index
         self.default_value = default_value
@@ -110,7 +106,6 @@ class AbortingDispatcher(object):
     """A dispatcher for testing. This dispatcher raises an exception in
     do_extra_handshake to reject the request.
     """
-
     def do_extra_handshake(self, conn_context):
         raise HandshakeAbortedException('An exception to reject the request')
 
@@ -122,7 +117,6 @@ class AbortedByUserDispatcher(object):
     """A dispatcher for testing. This dispatcher raises an
     AbortedByUserException in do_extra_handshake to reject the request.
     """
-
     def do_extra_handshake(self, conn_context):
         raise AbortedByUserException('An AbortedByUserException to reject the '
                                      'request')
@@ -132,17 +126,16 @@ class AbortedByUserDispatcher(object):
 
 
 _EXPECTED_RESPONSE = (
-    'HTTP/1.1 101 Switching Protocols\r\n'
-    'Upgrade: websocket\r\n'
-    'Connection: Upgrade\r\n'
-    'Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\n\r\n')
+    b'HTTP/1.1 101 Switching Protocols\r\n'
+    b'Upgrade: websocket\r\n'
+    b'Connection: Upgrade\r\n'
+    b'Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\n\r\n')
 
 
 class HandshakerTest(unittest.TestCase):
     """A unittest for draft-ietf-hybi-thewebsocketprotocol-06 and later
     handshake processor.
     """
-
     def test_do_handshake(self):
         request = _create_request(_create_good_request_def())
         dispatcher = mock.MockDispatcher()
@@ -151,8 +144,7 @@ class HandshakerTest(unittest.TestCase):
 
         self.assertTrue(dispatcher.do_extra_handshake_called)
 
-        self.assertEqual(
-            _EXPECTED_RESPONSE, request.connection.written_data())
+        self.assertEqual(_EXPECTED_RESPONSE, request.connection.written_data())
         self.assertEqual('/demo', request.ws_resource)
         self.assertEqual('http://example.com', request.ws_origin)
         self.assertEqual(None, request.ws_protocol)
@@ -168,8 +160,7 @@ class HandshakerTest(unittest.TestCase):
         request = _create_request(request_def)
         handshaker = _create_handshaker(request)
         handshaker.do_handshake()
-        self.assertEqual(
-            _EXPECTED_RESPONSE, request.connection.written_data())
+        self.assertEqual(_EXPECTED_RESPONSE, request.connection.written_data())
 
     def test_do_handshake_with_capitalized_value(self):
         request_def = _create_good_request_def()
@@ -178,8 +169,7 @@ class HandshakerTest(unittest.TestCase):
         request = _create_request(request_def)
         handshaker = _create_handshaker(request)
         handshaker.do_handshake()
-        self.assertEqual(
-            _EXPECTED_RESPONSE, request.connection.written_data())
+        self.assertEqual(_EXPECTED_RESPONSE, request.connection.written_data())
 
         request_def = _create_good_request_def()
         request_def.headers['Connection'] = 'UPGRADE'
@@ -187,8 +177,7 @@ class HandshakerTest(unittest.TestCase):
         request = _create_request(request_def)
         handshaker = _create_handshaker(request)
         handshaker.do_handshake()
-        self.assertEqual(
-            _EXPECTED_RESPONSE, request.connection.written_data())
+        self.assertEqual(_EXPECTED_RESPONSE, request.connection.written_data())
 
     def test_do_handshake_with_multiple_connection_values(self):
         request_def = _create_good_request_def()
@@ -197,13 +186,11 @@ class HandshakerTest(unittest.TestCase):
         request = _create_request(request_def)
         handshaker = _create_handshaker(request)
         handshaker.do_handshake()
-        self.assertEqual(
-            _EXPECTED_RESPONSE, request.connection.written_data())
+        self.assertEqual(_EXPECTED_RESPONSE, request.connection.written_data())
 
     def test_aborting_handshake(self):
-        handshaker = Handshaker(
-            _create_request(_create_good_request_def()),
-            AbortingDispatcher())
+        handshaker = Handshaker(_create_request(_create_good_request_def()),
+                                AbortingDispatcher())
         # do_extra_handshake raises an exception. Check that it's not caught by
         # do_handshake.
         self.assertRaises(HandshakeAbortedException, handshaker.do_handshake)
@@ -217,11 +204,11 @@ class HandshakerTest(unittest.TestCase):
         handshaker.do_handshake()
 
         EXPECTED_RESPONSE = (
-            'HTTP/1.1 101 Switching Protocols\r\n'
-            'Upgrade: websocket\r\n'
-            'Connection: Upgrade\r\n'
-            'Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\n'
-            'Sec-WebSocket-Protocol: chat\r\n\r\n')
+            b'HTTP/1.1 101 Switching Protocols\r\n'
+            b'Upgrade: websocket\r\n'
+            b'Connection: Upgrade\r\n'
+            b'Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\n'
+            b'Sec-WebSocket-Protocol: chat\r\n\r\n')
 
         self.assertEqual(EXPECTED_RESPONSE, request.connection.written_data())
         self.assertEqual('chat', request.ws_protocol)
@@ -229,8 +216,8 @@ class HandshakerTest(unittest.TestCase):
     def test_do_handshake_protocol_not_in_request_but_in_response(self):
         request_def = _create_good_request_def()
         request = _create_request(request_def)
-        handshaker = Handshaker(
-            request, SubprotocolChoosingDispatcher(-1, 'foobar'))
+        handshaker = Handshaker(request,
+                                SubprotocolChoosingDispatcher(-1, 'foobar'))
         # No request has been made but ws_protocol is set. HandshakeException
         # must be raised.
         self.assertRaises(HandshakeException, handshaker.do_handshake)
@@ -250,13 +237,13 @@ class HandshakerTest(unittest.TestCase):
             'permessage-deflate; server_no_context_takeover')
 
         EXPECTED_RESPONSE = (
-            'HTTP/1.1 101 Switching Protocols\r\n'
-            'Upgrade: websocket\r\n'
-            'Connection: Upgrade\r\n'
-            'Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\n'
-            'Sec-WebSocket-Extensions: '
-                'permessage-deflate; server_no_context_takeover\r\n'
-            '\r\n')
+            b'HTTP/1.1 101 Switching Protocols\r\n'
+            b'Upgrade: websocket\r\n'
+            b'Connection: Upgrade\r\n'
+            b'Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\n'
+            b'Sec-WebSocket-Extensions: '
+            b'permessage-deflate; server_no_context_takeover\r\n'
+            b'\r\n')
 
         request = _create_request(request_def)
         handshaker = _create_handshaker(request)
@@ -264,16 +251,13 @@ class HandshakerTest(unittest.TestCase):
         self.assertEqual(EXPECTED_RESPONSE, request.connection.written_data())
         self.assertEqual(1, len(request.ws_extensions))
         extension = request.ws_extensions[0]
-        self.assertEqual(common.PERMESSAGE_DEFLATE_EXTENSION,
-                         extension.name())
+        self.assertEqual(common.PERMESSAGE_DEFLATE_EXTENSION, extension.name())
         self.assertEqual(['server_no_context_takeover'],
                          extension.get_parameter_names())
-        self.assertEqual(None,
-                         extension.get_parameter_value(
-                             'server_no_context_takeover'))
+        self.assertEqual(
+            None, extension.get_parameter_value('server_no_context_takeover'))
         self.assertEqual(1, len(request.ws_extension_processors))
-        self.assertEqual('deflate',
-                         request.ws_extension_processors[0].name())
+        self.assertEqual('deflate', request.ws_extension_processors[0].name())
 
     def test_do_handshake_with_quoted_extensions(self):
         request_def = _create_good_request_def()
@@ -289,8 +273,8 @@ class HandshakerTest(unittest.TestCase):
         self.assertEqual('permessage-deflate', first_extension.name())
         second_extension = request.ws_requested_extensions[1]
         self.assertEqual('unknown', second_extension.name())
-        self.assertEqual(
-            ['e', 'ma', 'pv'], second_extension.get_parameter_names())
+        self.assertEqual(['e', 'ma', 'pv'],
+                         second_extension.get_parameter_names())
         self.assertEqual('mc^2', second_extension.get_parameter_value('e'))
         self.assertEqual(' \rf ', second_extension.get_parameter_value('ma'))
         self.assertEqual('nrt', second_extension.get_parameter_value('pv'))
@@ -303,122 +287,42 @@ class HandshakerTest(unittest.TestCase):
         request = _create_request(request_def)
         handshaker = _create_handshaker(request)
         handshaker.do_handshake()
-        self.assertEqual(
-            'AValue', request.headers_in['AKey'])
-        self.assertEqual(
-            '', request.headers_in['EmptyValue'])
+        self.assertEqual('AValue', request.headers_in['AKey'])
+        self.assertEqual('', request.headers_in['EmptyValue'])
 
     def test_abort_extra_handshake(self):
-        handshaker = Handshaker(
-            _create_request(_create_good_request_def()),
-            AbortedByUserDispatcher())
+        handshaker = Handshaker(_create_request(_create_good_request_def()),
+                                AbortedByUserDispatcher())
         # do_extra_handshake raises an AbortedByUserException. Check that it's
         # not caught by do_handshake.
         self.assertRaises(AbortedByUserException, handshaker.do_handshake)
 
-    def test_do_handshake_with_mux_and_deflate_frame(self):
-        request_def = _create_good_request_def()
-        request_def.headers['Sec-WebSocket-Extensions'] = ('%s, %s' % (
-                common.MUX_EXTENSION,
-                common.DEFLATE_FRAME_EXTENSION))
-        request = _create_request(request_def)
-        handshaker = _create_handshaker(request)
-        handshaker.do_handshake()
-        # mux should be rejected.
-        self.assertEqual(1, len(request.ws_extensions))
-        self.assertEqual(common.DEFLATE_FRAME_EXTENSION,
-                         request.ws_extensions[0].name())
-        self.assertEqual(2, len(request.ws_extension_processors))
-        self.assertEqual(common.MUX_EXTENSION,
-                         request.ws_extension_processors[0].name())
-        self.assertEqual(common.DEFLATE_FRAME_EXTENSION,
-                         request.ws_extension_processors[1].name())
-        self.assertFalse(hasattr(request, 'mux_processor'))
-
-    def test_do_handshake_with_deflate_frame_and_mux(self):
-        request_def = _create_good_request_def()
-        request_def.headers['Sec-WebSocket-Extensions'] = ('%s, %s' % (
-                common.DEFLATE_FRAME_EXTENSION,
-                common.MUX_EXTENSION))
-        request = _create_request(request_def)
-        handshaker = _create_handshaker(request)
-        handshaker.do_handshake()
-        # mux should be rejected.
-        self.assertEqual(1, len(request.ws_extensions))
-        first_extension = request.ws_extensions[0]
-        self.assertEqual(common.DEFLATE_FRAME_EXTENSION,
-                         first_extension.name())
-        self.assertEqual(2, len(request.ws_extension_processors))
-        self.assertEqual(common.DEFLATE_FRAME_EXTENSION,
-                         request.ws_extension_processors[0].name())
-        self.assertEqual(common.MUX_EXTENSION,
-                         request.ws_extension_processors[1].name())
-        self.assertFalse(hasattr(request, 'mux'))
-
-    def test_do_handshake_with_permessage_deflate_and_mux(self):
-        request_def = _create_good_request_def()
-        request_def.headers['Sec-WebSocket-Extensions'] = (
-            '%s, %s' % (
-                common.PERMESSAGE_DEFLATE_EXTENSION,
-                common.MUX_EXTENSION))
-        request = _create_request(request_def)
-        handshaker = _create_handshaker(request)
-        handshaker.do_handshake()
-
-        self.assertEqual(1, len(request.ws_extensions))
-        self.assertEqual(common.MUX_EXTENSION,
-                         request.ws_extensions[0].name())
-        self.assertEqual(2, len(request.ws_extension_processors))
-        self.assertEqual('deflate',
-                         request.ws_extension_processors[0].name())
-        self.assertEqual(common.MUX_EXTENSION,
-                         request.ws_extension_processors[1].name())
-        self.assertTrue(hasattr(request, 'mux_processor'))
-        self.assertTrue(request.mux_processor.is_active())
-        mux_extensions = request.mux_processor.extensions()
-        self.assertEqual(1, len(mux_extensions))
-        self.assertEqual(common.PERMESSAGE_DEFLATE_EXTENSION,
-                         mux_extensions[0].name())
-
-    def test_do_handshake_with_mux_and_permessage_deflate(self):
-        request_def = _create_good_request_def()
-        request_def.headers['Sec-WebSocket-Extensions'] = (
-            '%s, %s' % (
-                common.MUX_EXTENSION,
-                common.PERMESSAGE_DEFLATE_EXTENSION))
-        request = _create_request(request_def)
-        handshaker = _create_handshaker(request)
-        handshaker.do_handshake()
-        # mux should be rejected.
-        self.assertEqual(1, len(request.ws_extensions))
-        first_extension = request.ws_extensions[0]
-        self.assertEqual(common.PERMESSAGE_DEFLATE_EXTENSION,
-                         first_extension.name())
-        self.assertEqual(2, len(request.ws_extension_processors))
-        self.assertEqual(common.MUX_EXTENSION,
-                         request.ws_extension_processors[0].name())
-        self.assertEqual('deflate',
-                         request.ws_extension_processors[1].name())
-        self.assertFalse(hasattr(request, 'mux_processor'))
-
     def test_bad_requests(self):
         bad_cases = [
             ('HTTP request',
              RequestDefinition(
-                 'GET', '/demo',
-                 {'Host': 'www.google.com',
-                  'User-Agent':
-                      'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5;'
-                      ' en-US; rv:1.9.1.3) Gecko/20090824 Firefox/3.5.3'
-                      ' GTB6 GTBA',
-                  'Accept':
-                      'text/html,application/xhtml+xml,application/xml;q=0.9,'
-                      '*/*;q=0.8',
-                  'Accept-Language': 'en-us,en;q=0.5',
-                  'Accept-Encoding': 'gzip,deflate',
-                  'Accept-Charset': 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
-                  'Keep-Alive': '300',
-                  'Connection': 'keep-alive'}), None, True)]
+                 'GET', '/demo', {
+                     'Host':
+                     'www.google.com',
+                     'User-Agent':
+                     'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5;'
+                     ' en-US; rv:1.9.1.3) Gecko/20090824 Firefox/3.5.3'
+                     ' GTB6 GTBA',
+                     'Accept':
+                     'text/html,application/xhtml+xml,application/xml;q=0.9,'
+                     '*/*;q=0.8',
+                     'Accept-Language':
+                     'en-us,en;q=0.5',
+                     'Accept-Encoding':
+                     'gzip,deflate',
+                     'Accept-Charset':
+                     'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
+                     'Keep-Alive':
+                     '300',
+                     'Connection':
+                     'keep-alive'
+                 }), None, True)
+        ]
 
         request_def = _create_good_request_def()
         request_def.method = 'POST'
@@ -462,8 +366,7 @@ class HandshakerTest(unittest.TestCase):
 
         request_def = _create_good_request_def()
         # The last character right before == must be any of A, Q, w and g.
-        request_def.headers['Sec-WebSocket-Key'] = (
-            'AQIDBAUGBwgJCgsMDQ4PEC==')
+        request_def.headers['Sec-WebSocket-Key'] = 'AQIDBAUGBwgJCgsMDQ4PEC=='
         bad_cases.append(
             ('Wrong Sec-WebSocket-Key (padding bits are not zero)',
              request_def, 400, True))
@@ -471,19 +374,18 @@ class HandshakerTest(unittest.TestCase):
         request_def = _create_good_request_def()
         request_def.headers['Sec-WebSocket-Key'] = (
             'dGhlIHNhbXBsZSBub25jZQ==,dGhlIHNhbXBsZSBub25jZQ==')
-        bad_cases.append(
-            ('Wrong Sec-WebSocket-Key (multiple values)',
-             request_def, 400, True))
+        bad_cases.append(('Wrong Sec-WebSocket-Key (multiple values)',
+                          request_def, 400, True))
 
         request_def = _create_good_request_def()
         del request_def.headers['Sec-WebSocket-Version']
-        bad_cases.append(('Missing Sec-WebSocket-Version', request_def, None,
-                          True))
+        bad_cases.append(
+            ('Missing Sec-WebSocket-Version', request_def, None, True))
 
         request_def = _create_good_request_def()
         request_def.headers['Sec-WebSocket-Version'] = '3'
-        bad_cases.append(('Wrong Sec-WebSocket-Version', request_def, None,
-                          False))
+        bad_cases.append(
+            ('Wrong Sec-WebSocket-Version', request_def, None, False))
 
         request_def = _create_good_request_def()
         request_def.headers['Sec-WebSocket-Version'] = '13, 13'
@@ -492,13 +394,13 @@ class HandshakerTest(unittest.TestCase):
 
         request_def = _create_good_request_def()
         request_def.headers['Sec-WebSocket-Protocol'] = 'illegal\x09protocol'
-        bad_cases.append(('Illegal Sec-WebSocket-Protocol',
-                          request_def, 400, True))
+        bad_cases.append(
+            ('Illegal Sec-WebSocket-Protocol', request_def, 400, True))
 
         request_def = _create_good_request_def()
         request_def.headers['Sec-WebSocket-Protocol'] = ''
-        bad_cases.append(('Empty Sec-WebSocket-Protocol',
-                          request_def, 400, True))
+        bad_cases.append(
+            ('Empty Sec-WebSocket-Protocol', request_def, 400, True))
 
         for (case_name, request_def, expected_status,
              expect_handshake_exception) in bad_cases:
@@ -517,5 +419,4 @@ class HandshakerTest(unittest.TestCase):
 if __name__ == '__main__':
     unittest.main()
 
-
 # vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_http_header_util.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_http_header_util.py
similarity index 86%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/test/test_http_header_util.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_http_header_util.py
index 436dc57c373..5ce01ef2839 100755
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_http_header_util.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_http_header_util.py
@@ -28,19 +28,17 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 """Tests for http_header_util module."""
 
-
+from __future__ import absolute_import
 import unittest
+import sys
 
 from mod_pywebsocket import http_header_util
 
 
 class UnitTest(unittest.TestCase):
     """A unittest for http_header_util module."""
-
     def test_parse_relative_uri(self):
         host, port, resource = http_header_util.parse_uri('/ws/test')
         self.assertEqual(None, host)
@@ -60,8 +58,7 @@ class UnitTest(unittest.TestCase):
         self.assertEqual(80, port)
         self.assertEqual('/ws/test', resource)
 
-        host, port, resource = http_header_util.parse_uri(
-            'wss://example.com/')
+        host, port, resource = http_header_util.parse_uri('wss://example.com/')
         self.assertEqual('example.com', host)
         self.assertEqual(443, port)
         self.assertEqual('/', resource)
@@ -76,15 +73,21 @@ class UnitTest(unittest.TestCase):
         host, port, resource = http_header_util.parse_uri('ws:///')
         self.assertEqual(None, resource)
 
-        host, port, resource = http_header_util.parse_uri('ws://localhost:')
+        host, port, resource = http_header_util.parse_uri(
+            'ws://localhost:INVALID_PORT')
         self.assertEqual(None, resource)
 
-        host, port, resource = http_header_util.parse_uri('ws://localhost:/ws')
-        self.assertEqual(None, resource)
+        host, port, resource = http_header_util.parse_uri(
+            'ws://localhost:-1/ws')
+        if sys.version >= '3.6':
+            self.assertEqual(None, resource)
+        else:
+            self.assertEqual('localhost', host)
+            self.assertEqual(80, port)
+            self.assertEqual('/ws', resource)
 
 
 if __name__ == '__main__':
     unittest.main()
 
-
 # vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_memorizingfile.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_memorizingfile.py
similarity index 88%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/test/test_memorizingfile.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_memorizingfile.py
index 8f1b8eef433..f7288c510b8 100755
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_memorizingfile.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_memorizingfile.py
@@ -28,13 +28,11 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 """Tests for memorizingfile module."""
 
-
-import StringIO
+from __future__ import absolute_import
 import unittest
+import six
 
 import set_sys_path  # Update sys.path to locate mod_pywebsocket module.
 
@@ -43,7 +41,6 @@ from mod_pywebsocket import memorizingfile
 
 class UtilTest(unittest.TestCase):
     """A unittest for memorizingfile module."""
-
     def check(self, memorizing_file, num_read, expected_list):
         for unused in range(num_read):
             memorizing_file.readline()
@@ -76,29 +73,28 @@ class UtilTest(unittest.TestCase):
             self.assertEqual(expected, read)
 
     def test_get_memorized_lines(self):
-        memorizing_file = memorizingfile.MemorizingFile(StringIO.StringIO(
-                'Hello\nWorld\nWelcome'))
+        memorizing_file = memorizingfile.MemorizingFile(
+            six.StringIO('Hello\nWorld\nWelcome'))
         self.check(memorizing_file, 3, ['Hello\n', 'World\n', 'Welcome'])
 
     def test_get_memorized_lines_limit_memorized_lines(self):
-        memorizing_file = memorizingfile.MemorizingFile(StringIO.StringIO(
-                'Hello\nWorld\nWelcome'), 2)
+        memorizing_file = memorizingfile.MemorizingFile(
+            six.StringIO('Hello\nWorld\nWelcome'), 2)
         self.check(memorizing_file, 3, ['Hello\n', 'World\n'])
 
     def test_get_memorized_lines_empty_file(self):
-        memorizing_file = memorizingfile.MemorizingFile(StringIO.StringIO(
-                ''))
+        memorizing_file = memorizingfile.MemorizingFile(six.StringIO(''))
         self.check(memorizing_file, 10, [])
 
     def test_get_memorized_lines_with_size(self):
         for size in range(1, 10):
-            memorizing_file = memorizingfile.MemorizingFile(StringIO.StringIO(
-                'Hello\nWorld\nWelcome'))
+            memorizing_file = memorizingfile.MemorizingFile(
+                six.StringIO('Hello\nWorld\nWelcome'))
             self.check_with_size(memorizing_file, size,
                                  ['Hello\n', 'World\n', 'Welcome'])
 
+
 if __name__ == '__main__':
     unittest.main()
 
-
 # vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_mock.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_mock.py
similarity index 76%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/test/test_mock.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_mock.py
index 7dc23a73d8f..073873dde97 100755
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_mock.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_mock.py
@@ -28,12 +28,10 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 """Tests for mock module."""
 
-
-import Queue
+from __future__ import absolute_import
+import six.moves.queue
 import threading
 import unittest
 
@@ -44,49 +42,45 @@ from test import mock
 
 class MockConnTest(unittest.TestCase):
     """A unittest for MockConn class."""
-
     def setUp(self):
-        self._conn = mock.MockConn('ABC\r\nDEFG\r\n\r\nHIJK')
+        self._conn = mock.MockConn(b'ABC\r\nDEFG\r\n\r\nHIJK')
 
     def test_readline(self):
-        self.assertEqual('ABC\r\n', self._conn.readline())
-        self.assertEqual('DEFG\r\n', self._conn.readline())
-        self.assertEqual('\r\n', self._conn.readline())
-        self.assertEqual('HIJK', self._conn.readline())
-        self.assertEqual('', self._conn.readline())
+        self.assertEqual(b'ABC\r\n', self._conn.readline())
+        self.assertEqual(b'DEFG\r\n', self._conn.readline())
+        self.assertEqual(b'\r\n', self._conn.readline())
+        self.assertEqual(b'HIJK', self._conn.readline())
+        self.assertEqual(b'', self._conn.readline())
 
     def test_read(self):
-        self.assertEqual('ABC\r\nD', self._conn.read(6))
-        self.assertEqual('EFG\r\n\r\nHI', self._conn.read(9))
-        self.assertEqual('JK', self._conn.read(10))
-        self.assertEqual('', self._conn.read(10))
+        self.assertEqual(b'ABC\r\nD', self._conn.read(6))
+        self.assertEqual(b'EFG\r\n\r\nHI', self._conn.read(9))
+        self.assertEqual(b'JK', self._conn.read(10))
+        self.assertEqual(b'', self._conn.read(10))
 
     def test_read_and_readline(self):
-        self.assertEqual('ABC\r\nD', self._conn.read(6))
-        self.assertEqual('EFG\r\n', self._conn.readline())
-        self.assertEqual('\r\nHIJK', self._conn.read(9))
-        self.assertEqual('', self._conn.readline())
+        self.assertEqual(b'ABC\r\nD', self._conn.read(6))
+        self.assertEqual(b'EFG\r\n', self._conn.readline())
+        self.assertEqual(b'\r\nHIJK', self._conn.read(9))
+        self.assertEqual(b'', self._conn.readline())
 
     def test_write(self):
-        self._conn.write('Hello\r\n')
-        self._conn.write('World\r\n')
-        self.assertEqual('Hello\r\nWorld\r\n', self._conn.written_data())
+        self._conn.write(b'Hello\r\n')
+        self._conn.write(b'World\r\n')
+        self.assertEqual(b'Hello\r\nWorld\r\n', self._conn.written_data())
 
 
 class MockBlockingConnTest(unittest.TestCase):
     """A unittest for MockBlockingConn class."""
-
     def test_read(self):
         """Tests that data put to MockBlockingConn by put_bytes method can be
         read from it.
         """
-
         class LineReader(threading.Thread):
             """A test class that launches a thread, calls readline on the
             specified conn repeatedly and puts the read data to the specified
             queue.
             """
-
             def __init__(self, conn, queue):
                 threading.Thread.__init__(self)
                 self._queue = queue
@@ -100,17 +94,16 @@ class MockBlockingConnTest(unittest.TestCase):
                     self._queue.put(data)
 
         conn = mock.MockBlockingConn()
-        queue = Queue.Queue()
+        queue = six.moves.queue.Queue()
         reader = LineReader(conn, queue)
-        self.failUnless(queue.empty())
-        conn.put_bytes('Foo bar\r\n')
+        self.assertTrue(queue.empty())
+        conn.put_bytes(b'Foo bar\r\n')
         read = queue.get()
-        self.assertEqual('Foo bar\r\n', read)
+        self.assertEqual(b'Foo bar\r\n', read)
 
 
 class MockTableTest(unittest.TestCase):
     """A unittest for MockTable class."""
-
     def test_create_from_dict(self):
         table = mock.MockTable({'Key': 'Value'})
         self.assertEqual('Value', table.get('KEY'))
@@ -122,7 +115,7 @@ class MockTableTest(unittest.TestCase):
         self.assertEqual('Value', table['key'])
 
     def test_create_from_tuple(self):
-        table = mock.MockTable((('Key', 'Value'),))
+        table = mock.MockTable((('Key', 'Value'), ))
         self.assertEqual('Value', table.get('KEY'))
         self.assertEqual('Value', table['key'])
 
@@ -141,5 +134,4 @@ class MockTableTest(unittest.TestCase):
 if __name__ == '__main__':
     unittest.main()
 
-
 # vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_msgutil.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_msgutil.py
new file mode 100755
index 00000000000..943f21b8d29
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_msgutil.py
@@ -0,0 +1,916 @@
+#!/usr/bin/env python
+#
+# Copyright 2012, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+"""Tests for msgutil module."""
+
+from __future__ import absolute_import
+from __future__ import print_function
+from __future__ import division
+import array
+import six.moves.queue
+import random
+import struct
+import unittest
+import zlib
+
+import set_sys_path  # Update sys.path to locate mod_pywebsocket module.
+
+from mod_pywebsocket import common
+from mod_pywebsocket.extensions import PerMessageDeflateExtensionProcessor
+from mod_pywebsocket import msgutil
+from mod_pywebsocket.stream import InvalidUTF8Exception
+from mod_pywebsocket.stream import Stream
+from mod_pywebsocket.stream import StreamOptions
+from mod_pywebsocket import util
+from test import mock
+from six.moves import map
+from six.moves import range
+from six import iterbytes
+
+# We use one fixed nonce for testing instead of cryptographically secure PRNG.
+_MASKING_NONCE = b'ABCD'
+
+
+def _mask_hybi(frame):
+    if isinstance(frame, six.text_type):
+        Exception('masking does not accept Texts')
+
+    frame_key = list(iterbytes(_MASKING_NONCE))
+    frame_key_len = len(frame_key)
+    result = bytearray(frame)
+    count = 0
+
+    for i in range(len(result)):
+        result[i] ^= frame_key[count]
+        count = (count + 1) % frame_key_len
+
+    return _MASKING_NONCE + bytes(result)
+
+
+def _install_extension_processor(processor, request, stream_options):
+    response = processor.get_extension_response()
+    if response is not None:
+        processor.setup_stream_options(stream_options)
+        request.ws_extension_processors.append(processor)
+
+
+def _create_request_from_rawdata(read_data, permessage_deflate_request=None):
+    req = mock.MockRequest(connection=mock.MockConn(read_data))
+    req.ws_version = common.VERSION_HYBI_LATEST
+    req.ws_extension_processors = []
+
+    processor = None
+    if permessage_deflate_request is not None:
+        processor = PerMessageDeflateExtensionProcessor(
+            permessage_deflate_request)
+
+    stream_options = StreamOptions()
+    if processor is not None:
+        _install_extension_processor(processor, req, stream_options)
+    req.ws_stream = Stream(req, stream_options)
+
+    return req
+
+
+def _create_request(*frames):
+    """Creates MockRequest using data given as frames.
+
+    frames will be returned on calling request.connection.read() where request
+    is MockRequest returned by this function.
+    """
+
+    read_data = []
+    for (header, body) in frames:
+        read_data.append(header + _mask_hybi(body))
+
+    return _create_request_from_rawdata(b''.join(read_data))
+
+
+def _create_blocking_request():
+    """Creates MockRequest.
+
+    Data written to a MockRequest can be read out by calling
+    request.connection.written_data().
+    """
+
+    req = mock.MockRequest(connection=mock.MockBlockingConn())
+    req.ws_version = common.VERSION_HYBI_LATEST
+    stream_options = StreamOptions()
+    req.ws_stream = Stream(req, stream_options)
+    return req
+
+
+class BasicMessageTest(unittest.TestCase):
+    """Basic tests for Stream."""
+    def test_send_message(self):
+        request = _create_request()
+        msgutil.send_message(request, 'Hello')
+        self.assertEqual(b'\x81\x05Hello', request.connection.written_data())
+
+        payload = 'a' * 125
+        request = _create_request()
+        msgutil.send_message(request, payload)
+        self.assertEqual(b'\x81\x7d' + payload.encode('UTF-8'),
+                         request.connection.written_data())
+
+    def test_send_medium_message(self):
+        payload = 'a' * 126
+        request = _create_request()
+        msgutil.send_message(request, payload)
+        self.assertEqual(b'\x81\x7e\x00\x7e' + payload.encode('UTF-8'),
+                         request.connection.written_data())
+
+        payload = 'a' * ((1 << 16) - 1)
+        request = _create_request()
+        msgutil.send_message(request, payload)
+        self.assertEqual(b'\x81\x7e\xff\xff' + payload.encode('UTF-8'),
+                         request.connection.written_data())
+
+    def test_send_large_message(self):
+        payload = 'a' * (1 << 16)
+        request = _create_request()
+        msgutil.send_message(request, payload)
+        self.assertEqual(
+            b'\x81\x7f\x00\x00\x00\x00\x00\x01\x00\x00' +
+            payload.encode('UTF-8'), request.connection.written_data())
+
+    def test_send_message_unicode(self):
+        request = _create_request()
+        msgutil.send_message(request, u'\u65e5')
+        # U+65e5 is encoded as e6,97,a5 in UTF-8
+        self.assertEqual(b'\x81\x03\xe6\x97\xa5',
+                         request.connection.written_data())
+
+    def test_send_message_fragments(self):
+        request = _create_request()
+        msgutil.send_message(request, 'Hello', False)
+        msgutil.send_message(request, ' ', False)
+        msgutil.send_message(request, 'World', False)
+        msgutil.send_message(request, '!', True)
+        self.assertEqual(b'\x01\x05Hello\x00\x01 \x00\x05World\x80\x01!',
+                         request.connection.written_data())
+
+    def test_send_fragments_immediate_zero_termination(self):
+        request = _create_request()
+        msgutil.send_message(request, 'Hello World!', False)
+        msgutil.send_message(request, '', True)
+        self.assertEqual(b'\x01\x0cHello World!\x80\x00',
+                         request.connection.written_data())
+
+    def test_receive_message(self):
+        request = _create_request((b'\x81\x85', b'Hello'),
+                                  (b'\x81\x86', b'World!'))
+        self.assertEqual('Hello', msgutil.receive_message(request))
+        self.assertEqual('World!', msgutil.receive_message(request))
+
+        payload = b'a' * 125
+        request = _create_request((b'\x81\xfd', payload))
+        self.assertEqual(payload.decode('UTF-8'),
+                         msgutil.receive_message(request))
+
+    def test_receive_medium_message(self):
+        payload = b'a' * 126
+        request = _create_request((b'\x81\xfe\x00\x7e', payload))
+        self.assertEqual(payload.decode('UTF-8'),
+                         msgutil.receive_message(request))
+
+        payload = b'a' * ((1 << 16) - 1)
+        request = _create_request((b'\x81\xfe\xff\xff', payload))
+        self.assertEqual(payload.decode('UTF-8'),
+                         msgutil.receive_message(request))
+
+    def test_receive_large_message(self):
+        payload = b'a' * (1 << 16)
+        request = _create_request(
+            (b'\x81\xff\x00\x00\x00\x00\x00\x01\x00\x00', payload))
+        self.assertEqual(payload.decode('UTF-8'),
+                         msgutil.receive_message(request))
+
+    def test_receive_length_not_encoded_using_minimal_number_of_bytes(self):
+        # Log warning on receiving bad payload length field that doesn't use
+        # minimal number of bytes but continue processing.
+
+        payload = b'a'
+        # 1 byte can be represented without extended payload length field.
+        request = _create_request(
+            (b'\x81\xff\x00\x00\x00\x00\x00\x00\x00\x01', payload))
+        self.assertEqual(payload.decode('UTF-8'),
+                         msgutil.receive_message(request))
+
+    def test_receive_message_unicode(self):
+        request = _create_request((b'\x81\x83', b'\xe6\x9c\xac'))
+        # U+672c is encoded as e6,9c,ac in UTF-8
+        self.assertEqual(u'\u672c', msgutil.receive_message(request))
+
+    def test_receive_message_erroneous_unicode(self):
+        # \x80 and \x81 are invalid as UTF-8.
+        request = _create_request((b'\x81\x82', b'\x80\x81'))
+        # Invalid characters should raise InvalidUTF8Exception
+        self.assertRaises(InvalidUTF8Exception, msgutil.receive_message,
+                          request)
+
+    def test_receive_fragments(self):
+        request = _create_request((b'\x01\x85', b'Hello'), (b'\x00\x81', b' '),
+                                  (b'\x00\x85', b'World'), (b'\x80\x81', b'!'))
+        self.assertEqual('Hello World!', msgutil.receive_message(request))
+
+    def test_receive_fragments_unicode(self):
+        # UTF-8 encodes U+6f22 into e6bca2 and U+5b57 into e5ad97.
+        request = _create_request((b'\x01\x82', b'\xe6\xbc'),
+                                  (b'\x00\x82', b'\xa2\xe5'),
+                                  (b'\x80\x82', b'\xad\x97'))
+        self.assertEqual(u'\u6f22\u5b57', msgutil.receive_message(request))
+
+    def test_receive_fragments_immediate_zero_termination(self):
+        request = _create_request((b'\x01\x8c', b'Hello World!'),
+                                  (b'\x80\x80', b''))
+        self.assertEqual('Hello World!', msgutil.receive_message(request))
+
+    def test_receive_fragments_duplicate_start(self):
+        request = _create_request((b'\x01\x85', b'Hello'),
+                                  (b'\x01\x85', b'World'))
+        self.assertRaises(msgutil.InvalidFrameException,
+                          msgutil.receive_message, request)
+
+    def test_receive_fragments_intermediate_but_not_started(self):
+        request = _create_request((b'\x00\x85', b'Hello'))
+        self.assertRaises(msgutil.InvalidFrameException,
+                          msgutil.receive_message, request)
+
+    def test_receive_fragments_end_but_not_started(self):
+        request = _create_request((b'\x80\x85', b'Hello'))
+        self.assertRaises(msgutil.InvalidFrameException,
+                          msgutil.receive_message, request)
+
+    def test_receive_message_discard(self):
+        request = _create_request(
+            (b'\x8f\x86', b'IGNORE'), (b'\x81\x85', b'Hello'),
+            (b'\x8f\x89', b'DISREGARD'), (b'\x81\x86', b'World!'))
+        self.assertRaises(msgutil.UnsupportedFrameException,
+                          msgutil.receive_message, request)
+        self.assertEqual('Hello', msgutil.receive_message(request))
+        self.assertRaises(msgutil.UnsupportedFrameException,
+                          msgutil.receive_message, request)
+        self.assertEqual('World!', msgutil.receive_message(request))
+
+    def test_receive_close(self):
+        request = _create_request(
+            (b'\x88\x8a', struct.pack('!H', 1000) + b'Good bye'))
+        self.assertEqual(None, msgutil.receive_message(request))
+        self.assertEqual(1000, request.ws_close_code)
+        self.assertEqual('Good bye', request.ws_close_reason)
+
+    def test_send_longest_close(self):
+        reason = 'a' * 123
+        request = _create_request(
+            (b'\x88\xfd', struct.pack('!H', common.STATUS_NORMAL_CLOSURE) +
+             reason.encode('UTF-8')))
+        request.ws_stream.close_connection(common.STATUS_NORMAL_CLOSURE,
+                                           reason)
+        self.assertEqual(request.ws_close_code, common.STATUS_NORMAL_CLOSURE)
+        self.assertEqual(request.ws_close_reason, reason)
+
+    def test_send_close_too_long(self):
+        request = _create_request()
+        self.assertRaises(msgutil.BadOperationException,
+                          Stream.close_connection, request.ws_stream,
+                          common.STATUS_NORMAL_CLOSURE, 'a' * 124)
+
+    def test_send_close_inconsistent_code_and_reason(self):
+        request = _create_request()
+        # reason parameter must not be specified when code is None.
+        self.assertRaises(msgutil.BadOperationException,
+                          Stream.close_connection, request.ws_stream, None,
+                          'a')
+
+    def test_send_ping(self):
+        request = _create_request()
+        msgutil.send_ping(request, 'Hello World!')
+        self.assertEqual(b'\x89\x0cHello World!',
+                         request.connection.written_data())
+
+    def test_send_longest_ping(self):
+        request = _create_request()
+        msgutil.send_ping(request, 'a' * 125)
+        self.assertEqual(b'\x89\x7d' + b'a' * 125,
+                         request.connection.written_data())
+
+    def test_send_ping_too_long(self):
+        request = _create_request()
+        self.assertRaises(msgutil.BadOperationException, msgutil.send_ping,
+                          request, 'a' * 126)
+
+    def test_receive_ping(self):
+        """Tests receiving a ping control frame."""
+        def handler(request, message):
+            request.called = True
+
+        # Stream automatically respond to ping with pong without any action
+        # by application layer.
+        request = _create_request((b'\x89\x85', b'Hello'),
+                                  (b'\x81\x85', b'World'))
+        self.assertEqual('World', msgutil.receive_message(request))
+        self.assertEqual(b'\x8a\x05Hello', request.connection.written_data())
+
+        request = _create_request((b'\x89\x85', b'Hello'),
+                                  (b'\x81\x85', b'World'))
+        request.on_ping_handler = handler
+        self.assertEqual('World', msgutil.receive_message(request))
+        self.assertTrue(request.called)
+
+    def test_receive_longest_ping(self):
+        request = _create_request((b'\x89\xfd', b'a' * 125),
+                                  (b'\x81\x85', b'World'))
+        self.assertEqual('World', msgutil.receive_message(request))
+        self.assertEqual(b'\x8a\x7d' + b'a' * 125,
+                         request.connection.written_data())
+
+    def test_receive_ping_too_long(self):
+        request = _create_request((b'\x89\xfe\x00\x7e', b'a' * 126))
+        self.assertRaises(msgutil.InvalidFrameException,
+                          msgutil.receive_message, request)
+
+    def test_receive_pong(self):
+        """Tests receiving a pong control frame."""
+        def handler(request, message):
+            request.called = True
+
+        request = _create_request((b'\x8a\x85', b'Hello'),
+                                  (b'\x81\x85', b'World'))
+        request.on_pong_handler = handler
+        msgutil.send_ping(request, 'Hello')
+        self.assertEqual(b'\x89\x05Hello', request.connection.written_data())
+        # Valid pong is received, but receive_message won't return for it.
+        self.assertEqual('World', msgutil.receive_message(request))
+        # Check that nothing was written after receive_message call.
+        self.assertEqual(b'\x89\x05Hello', request.connection.written_data())
+
+        self.assertTrue(request.called)
+
+    def test_receive_unsolicited_pong(self):
+        # Unsolicited pong is allowed from HyBi 07.
+        request = _create_request((b'\x8a\x85', b'Hello'),
+                                  (b'\x81\x85', b'World'))
+        msgutil.receive_message(request)
+
+        request = _create_request((b'\x8a\x85', b'Hello'),
+                                  (b'\x81\x85', b'World'))
+        msgutil.send_ping(request, 'Jumbo')
+        # Body mismatch.
+        msgutil.receive_message(request)
+
+    def test_ping_cannot_be_fragmented(self):
+        request = _create_request((b'\x09\x85', b'Hello'))
+        self.assertRaises(msgutil.InvalidFrameException,
+                          msgutil.receive_message, request)
+
+    def test_ping_with_too_long_payload(self):
+        request = _create_request((b'\x89\xfe\x01\x00', b'a' * 256))
+        self.assertRaises(msgutil.InvalidFrameException,
+                          msgutil.receive_message, request)
+
+
+class PerMessageDeflateTest(unittest.TestCase):
+    """Tests for permessage-deflate extension."""
+    def test_response_parameters(self):
+        extension = common.ExtensionParameter(
+            common.PERMESSAGE_DEFLATE_EXTENSION)
+        extension.add_parameter('server_no_context_takeover', None)
+        processor = PerMessageDeflateExtensionProcessor(extension)
+        response = processor.get_extension_response()
+        self.assertTrue(response.has_parameter('server_no_context_takeover'))
+        self.assertEqual(
+            None, response.get_parameter_value('server_no_context_takeover'))
+
+        extension = common.ExtensionParameter(
+            common.PERMESSAGE_DEFLATE_EXTENSION)
+        extension.add_parameter('client_max_window_bits', None)
+        processor = PerMessageDeflateExtensionProcessor(extension)
+
+        processor.set_client_max_window_bits(8)
+        processor.set_client_no_context_takeover(True)
+        response = processor.get_extension_response()
+        self.assertEqual(
+            '8', response.get_parameter_value('client_max_window_bits'))
+        self.assertTrue(response.has_parameter('client_no_context_takeover'))
+        self.assertEqual(
+            None, response.get_parameter_value('client_no_context_takeover'))
+
+    def test_send_message(self):
+        extension = common.ExtensionParameter(
+            common.PERMESSAGE_DEFLATE_EXTENSION)
+        request = _create_request_from_rawdata(
+            b'', permessage_deflate_request=extension)
+        msgutil.send_message(request, 'Hello')
+
+        compress = zlib.compressobj(zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED,
+                                    -zlib.MAX_WBITS)
+        compressed_hello = compress.compress(b'Hello')
+        compressed_hello += compress.flush(zlib.Z_SYNC_FLUSH)
+        compressed_hello = compressed_hello[:-4]
+        expected = b'\xc1%c' % len(compressed_hello)
+        expected += compressed_hello
+        self.assertEqual(expected, request.connection.written_data())
+
+    def test_send_empty_message(self):
+        """Test that an empty message is compressed correctly."""
+
+        extension = common.ExtensionParameter(
+            common.PERMESSAGE_DEFLATE_EXTENSION)
+        request = _create_request_from_rawdata(
+            b'', permessage_deflate_request=extension)
+
+        msgutil.send_message(request, '')
+
+        # Payload in binary: 0b00000000
+        # From LSB,
+        # - 1 bit of BFINAL (0)
+        # - 2 bits of BTYPE (no compression)
+        # - 5 bits of padding
+        self.assertEqual(b'\xc1\x01\x00', request.connection.written_data())
+
+    def test_send_message_with_null_character(self):
+        """Test that a simple payload (one null) is framed correctly."""
+
+        extension = common.ExtensionParameter(
+            common.PERMESSAGE_DEFLATE_EXTENSION)
+        request = _create_request_from_rawdata(
+            b'', permessage_deflate_request=extension)
+
+        msgutil.send_message(request, '\x00')
+
+        # Payload in binary: 0b01100010 0b00000000 0b00000000
+        # From LSB,
+        # - 1 bit of BFINAL (0)
+        # - 2 bits of BTYPE (01 that means fixed Huffman)
+        # - 8 bits of the first code (00110000 that is the code for the literal
+        #   alphabet 0x00)
+        # - 7 bits of the second code (0000000 that is the code for the
+        #   end-of-block)
+        # - 1 bit of BFINAL (0)
+        # - 2 bits of BTYPE (no compression)
+        # - 2 bits of padding
+        self.assertEqual(b'\xc1\x03\x62\x00\x00',
+                         request.connection.written_data())
+
+    def test_send_two_messages(self):
+        extension = common.ExtensionParameter(
+            common.PERMESSAGE_DEFLATE_EXTENSION)
+        request = _create_request_from_rawdata(
+            b'', permessage_deflate_request=extension)
+        msgutil.send_message(request, 'Hello')
+        msgutil.send_message(request, 'World')
+
+        compress = zlib.compressobj(zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED,
+                                    -zlib.MAX_WBITS)
+
+        expected = b''
+
+        compressed_hello = compress.compress(b'Hello')
+        compressed_hello += compress.flush(zlib.Z_SYNC_FLUSH)
+        compressed_hello = compressed_hello[:-4]
+        expected += b'\xc1%c' % len(compressed_hello)
+        expected += compressed_hello
+
+        compressed_world = compress.compress(b'World')
+        compressed_world += compress.flush(zlib.Z_SYNC_FLUSH)
+        compressed_world = compressed_world[:-4]
+        expected += b'\xc1%c' % len(compressed_world)
+        expected += compressed_world
+
+        self.assertEqual(expected, request.connection.written_data())
+
+    def test_send_message_fragmented(self):
+        extension = common.ExtensionParameter(
+            common.PERMESSAGE_DEFLATE_EXTENSION)
+        request = _create_request_from_rawdata(
+            b'', permessage_deflate_request=extension)
+        msgutil.send_message(request, 'Hello', end=False)
+        msgutil.send_message(request, 'Goodbye', end=False)
+        msgutil.send_message(request, 'World')
+
+        compress = zlib.compressobj(zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED,
+                                    -zlib.MAX_WBITS)
+        compressed_hello = compress.compress(b'Hello')
+        compressed_hello += compress.flush(zlib.Z_SYNC_FLUSH)
+        expected = b'\x41%c' % len(compressed_hello)
+        expected += compressed_hello
+        compressed_goodbye = compress.compress(b'Goodbye')
+        compressed_goodbye += compress.flush(zlib.Z_SYNC_FLUSH)
+        expected += b'\x00%c' % len(compressed_goodbye)
+        expected += compressed_goodbye
+        compressed_world = compress.compress(b'World')
+        compressed_world += compress.flush(zlib.Z_SYNC_FLUSH)
+        compressed_world = compressed_world[:-4]
+        expected += b'\x80%c' % len(compressed_world)
+        expected += compressed_world
+        self.assertEqual(expected, request.connection.written_data())
+
+    def test_send_message_fragmented_empty_first_frame(self):
+        extension = common.ExtensionParameter(
+            common.PERMESSAGE_DEFLATE_EXTENSION)
+        request = _create_request_from_rawdata(
+            b'', permessage_deflate_request=extension)
+        msgutil.send_message(request, '', end=False)
+        msgutil.send_message(request, 'Hello')
+
+        compress = zlib.compressobj(zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED,
+                                    -zlib.MAX_WBITS)
+        compressed_hello = compress.compress(b'')
+        compressed_hello += compress.flush(zlib.Z_SYNC_FLUSH)
+        expected = b'\x41%c' % len(compressed_hello)
+        expected += compressed_hello
+        compressed_empty = compress.compress(b'Hello')
+        compressed_empty += compress.flush(zlib.Z_SYNC_FLUSH)
+        compressed_empty = compressed_empty[:-4]
+        expected += b'\x80%c' % len(compressed_empty)
+        expected += compressed_empty
+        print('%r' % expected)
+        self.assertEqual(expected, request.connection.written_data())
+
+    def test_send_message_fragmented_empty_last_frame(self):
+        extension = common.ExtensionParameter(
+            common.PERMESSAGE_DEFLATE_EXTENSION)
+        request = _create_request_from_rawdata(
+            b'', permessage_deflate_request=extension)
+        msgutil.send_message(request, 'Hello', end=False)
+        msgutil.send_message(request, '')
+
+        compress = zlib.compressobj(zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED,
+                                    -zlib.MAX_WBITS)
+        compressed_hello = compress.compress(b'Hello')
+        compressed_hello += compress.flush(zlib.Z_SYNC_FLUSH)
+        expected = b'\x41%c' % len(compressed_hello)
+        expected += compressed_hello
+        compressed_empty = compress.compress(b'')
+        compressed_empty += compress.flush(zlib.Z_SYNC_FLUSH)
+        compressed_empty = compressed_empty[:-4]
+        expected += b'\x80%c' % len(compressed_empty)
+        expected += compressed_empty
+        self.assertEqual(expected, request.connection.written_data())
+
+    def test_send_message_using_small_window(self):
+        common_part = 'abcdefghijklmnopqrstuvwxyz'
+        test_message = common_part + '-' * 30000 + common_part
+
+        extension = common.ExtensionParameter(
+            common.PERMESSAGE_DEFLATE_EXTENSION)
+        extension.add_parameter('server_max_window_bits', '8')
+        request = _create_request_from_rawdata(
+            b'', permessage_deflate_request=extension)
+        msgutil.send_message(request, test_message)
+
+        expected_websocket_header_size = 2
+        expected_websocket_payload_size = 91
+
+        actual_frame = request.connection.written_data()
+        self.assertEqual(
+            expected_websocket_header_size + expected_websocket_payload_size,
+            len(actual_frame))
+        actual_header = actual_frame[0:expected_websocket_header_size]
+        actual_payload = actual_frame[expected_websocket_header_size:]
+
+        self.assertEqual(b'\xc1%c' % expected_websocket_payload_size,
+                         actual_header)
+        decompress = zlib.decompressobj(-8)
+        decompressed_message = decompress.decompress(actual_payload +
+                                                     b'\x00\x00\xff\xff')
+        decompressed_message += decompress.flush()
+        self.assertEqual(test_message, decompressed_message.decode('UTF-8'))
+        self.assertEqual(0, len(decompress.unused_data))
+        self.assertEqual(0, len(decompress.unconsumed_tail))
+
+    def test_send_message_no_context_takeover_parameter(self):
+        extension = common.ExtensionParameter(
+            common.PERMESSAGE_DEFLATE_EXTENSION)
+        extension.add_parameter('server_no_context_takeover', None)
+        request = _create_request_from_rawdata(
+            b'', permessage_deflate_request=extension)
+        for i in range(3):
+            msgutil.send_message(request, 'Hello', end=False)
+            msgutil.send_message(request, 'Hello', end=True)
+
+        compress = zlib.compressobj(zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED,
+                                    -zlib.MAX_WBITS)
+
+        first_hello = compress.compress(b'Hello')
+        first_hello += compress.flush(zlib.Z_SYNC_FLUSH)
+        expected = b'\x41%c' % len(first_hello)
+        expected += first_hello
+        second_hello = compress.compress(b'Hello')
+        second_hello += compress.flush(zlib.Z_SYNC_FLUSH)
+        second_hello = second_hello[:-4]
+        expected += b'\x80%c' % len(second_hello)
+        expected += second_hello
+
+        self.assertEqual(expected + expected + expected,
+                         request.connection.written_data())
+
+    def test_send_message_fragmented_bfinal(self):
+        extension = common.ExtensionParameter(
+            common.PERMESSAGE_DEFLATE_EXTENSION)
+        request = _create_request_from_rawdata(
+            b'', permessage_deflate_request=extension)
+        self.assertEqual(1, len(request.ws_extension_processors))
+        request.ws_extension_processors[0].set_bfinal(True)
+        msgutil.send_message(request, 'Hello', end=False)
+        msgutil.send_message(request, 'World', end=True)
+
+        expected = b''
+
+        compress = zlib.compressobj(zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED,
+                                    -zlib.MAX_WBITS)
+        compressed_hello = compress.compress(b'Hello')
+        compressed_hello += compress.flush(zlib.Z_FINISH)
+        compressed_hello = compressed_hello + struct.pack('!B', 0)
+        expected += b'\x41%c' % len(compressed_hello)
+        expected += compressed_hello
+
+        compress = zlib.compressobj(zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED,
+                                    -zlib.MAX_WBITS)
+        compressed_world = compress.compress(b'World')
+        compressed_world += compress.flush(zlib.Z_FINISH)
+        compressed_world = compressed_world + struct.pack('!B', 0)
+        expected += b'\x80%c' % len(compressed_world)
+        expected += compressed_world
+
+        self.assertEqual(expected, request.connection.written_data())
+
+    def test_receive_message_deflate(self):
+        compress = zlib.compressobj(zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED,
+                                    -zlib.MAX_WBITS)
+
+        compressed_hello = compress.compress(b'Hello')
+        compressed_hello += compress.flush(zlib.Z_SYNC_FLUSH)
+        compressed_hello = compressed_hello[:-4]
+        data = b'\xc1%c' % (len(compressed_hello) | 0x80)
+        data += _mask_hybi(compressed_hello)
+
+        # Close frame
+        data += b'\x88\x8a' + _mask_hybi(struct.pack('!H', 1000) + b'Good bye')
+
+        extension = common.ExtensionParameter(
+            common.PERMESSAGE_DEFLATE_EXTENSION)
+        request = _create_request_from_rawdata(
+            data, permessage_deflate_request=extension)
+        self.assertEqual('Hello', msgutil.receive_message(request))
+
+        self.assertEqual(None, msgutil.receive_message(request))
+
+    def test_receive_message_random_section(self):
+        """Test that a compressed message fragmented into lots of chunks is
+        correctly received.
+        """
+
+        random.seed(a=0)
+        payload = b''.join(
+            [struct.pack('!B', random.randint(0, 255)) for i in range(1000)])
+
+        compress = zlib.compressobj(zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED,
+                                    -zlib.MAX_WBITS)
+        compressed_payload = compress.compress(payload)
+        compressed_payload += compress.flush(zlib.Z_SYNC_FLUSH)
+        compressed_payload = compressed_payload[:-4]
+
+        # Fragment the compressed payload into lots of frames.
+        bytes_chunked = 0
+        data = b''
+        frame_count = 0
+
+        chunk_sizes = []
+
+        while bytes_chunked < len(compressed_payload):
+            # Make sure that
+            # - the length of chunks are equal or less than 125 so that we can
+            #   use 1 octet length header format for all frames.
+            # - at least 10 chunks are created.
+            chunk_size = random.randint(
+                1,
+                min(125,
+                    len(compressed_payload) // 10,
+                    len(compressed_payload) - bytes_chunked))
+            chunk_sizes.append(chunk_size)
+            chunk = compressed_payload[bytes_chunked:bytes_chunked +
+                                       chunk_size]
+            bytes_chunked += chunk_size
+
+            first_octet = 0x00
+            if len(data) == 0:
+                first_octet = first_octet | 0x42
+            if bytes_chunked == len(compressed_payload):
+                first_octet = first_octet | 0x80
+
+            data += b'%c%c' % (first_octet, chunk_size | 0x80)
+            data += _mask_hybi(chunk)
+
+            frame_count += 1
+
+        print("Chunk sizes: %r" % chunk_sizes)
+        self.assertTrue(len(chunk_sizes) > 10)
+
+        # Close frame
+        data += b'\x88\x8a' + _mask_hybi(struct.pack('!H', 1000) + b'Good bye')
+
+        extension = common.ExtensionParameter(
+            common.PERMESSAGE_DEFLATE_EXTENSION)
+        request = _create_request_from_rawdata(
+            data, permessage_deflate_request=extension)
+        self.assertEqual(payload, msgutil.receive_message(request))
+
+        self.assertEqual(None, msgutil.receive_message(request))
+
+    def test_receive_two_messages(self):
+        compress = zlib.compressobj(zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED,
+                                    -zlib.MAX_WBITS)
+
+        data = b''
+
+        compressed_hello = compress.compress(b'HelloWebSocket')
+        compressed_hello += compress.flush(zlib.Z_SYNC_FLUSH)
+        compressed_hello = compressed_hello[:-4]
+        split_position = len(compressed_hello) // 2
+        data += b'\x41%c' % (split_position | 0x80)
+        data += _mask_hybi(compressed_hello[:split_position])
+
+        data += b'\x80%c' % ((len(compressed_hello) - split_position) | 0x80)
+        data += _mask_hybi(compressed_hello[split_position:])
+
+        compress = zlib.compressobj(zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED,
+                                    -zlib.MAX_WBITS)
+
+        compressed_world = compress.compress(b'World')
+        compressed_world += compress.flush(zlib.Z_SYNC_FLUSH)
+        compressed_world = compressed_world[:-4]
+        data += b'\xc1%c' % (len(compressed_world) | 0x80)
+        data += _mask_hybi(compressed_world)
+
+        # Close frame
+        data += b'\x88\x8a' + _mask_hybi(struct.pack('!H', 1000) + b'Good bye')
+
+        extension = common.ExtensionParameter(
+            common.PERMESSAGE_DEFLATE_EXTENSION)
+        request = _create_request_from_rawdata(
+            data, permessage_deflate_request=extension)
+        self.assertEqual('HelloWebSocket', msgutil.receive_message(request))
+        self.assertEqual('World', msgutil.receive_message(request))
+
+        self.assertEqual(None, msgutil.receive_message(request))
+
+    def test_receive_message_mixed_btype(self):
+        """Test that a message compressed using lots of DEFLATE blocks with
+        various flush mode is correctly received.
+        """
+
+        random.seed(a=0)
+        payload = b''.join(
+            [struct.pack('!B', random.randint(0, 255)) for i in range(1000)])
+
+        compress = None
+
+        # Fragment the compressed payload into lots of frames.
+        bytes_chunked = 0
+        compressed_payload = b''
+
+        chunk_sizes = []
+        methods = []
+        sync_used = False
+        finish_used = False
+
+        while bytes_chunked < len(payload):
+            # Make sure at least 10 chunks are created.
+            chunk_size = random.randint(1,
+                                        min(100,
+                                            len(payload) - bytes_chunked))
+            chunk_sizes.append(chunk_size)
+            chunk = payload[bytes_chunked:bytes_chunked + chunk_size]
+
+            bytes_chunked += chunk_size
+
+            if compress is None:
+                compress = zlib.compressobj(zlib.Z_DEFAULT_COMPRESSION,
+                                            zlib.DEFLATED, -zlib.MAX_WBITS)
+
+            if bytes_chunked == len(payload):
+                compressed_payload += compress.compress(chunk)
+                compressed_payload += compress.flush(zlib.Z_SYNC_FLUSH)
+                compressed_payload = compressed_payload[:-4]
+            else:
+                method = random.randint(0, 1)
+                methods.append(method)
+                if method == 0:
+                    compressed_payload += compress.compress(chunk)
+                    compressed_payload += compress.flush(zlib.Z_SYNC_FLUSH)
+                    sync_used = True
+                else:
+                    compressed_payload += compress.compress(chunk)
+                    compressed_payload += compress.flush(zlib.Z_FINISH)
+                    compress = None
+                    finish_used = True
+
+        print("Chunk sizes: %r" % chunk_sizes)
+        self.assertTrue(len(chunk_sizes) > 10)
+        print("Methods: %r" % methods)
+        self.assertTrue(sync_used)
+        self.assertTrue(finish_used)
+
+        self.assertTrue(125 < len(compressed_payload))
+        self.assertTrue(len(compressed_payload) < 65536)
+        data = b'\xc2\xfe' + struct.pack('!H', len(compressed_payload))
+        data += _mask_hybi(compressed_payload)
+
+        # Close frame
+        data += b'\x88\x8a' + _mask_hybi(struct.pack('!H', 1000) + b'Good bye')
+
+        extension = common.ExtensionParameter(
+            common.PERMESSAGE_DEFLATE_EXTENSION)
+        request = _create_request_from_rawdata(
+            data, permessage_deflate_request=extension)
+        self.assertEqual(payload, msgutil.receive_message(request))
+
+        self.assertEqual(None, msgutil.receive_message(request))
+
+
+class MessageReceiverTest(unittest.TestCase):
+    """Tests the Stream class using MessageReceiver."""
+    def test_queue(self):
+        request = _create_blocking_request()
+        receiver = msgutil.MessageReceiver(request)
+
+        self.assertEqual(None, receiver.receive_nowait())
+
+        request.connection.put_bytes(b'\x81\x86' + _mask_hybi(b'Hello!'))
+        self.assertEqual('Hello!', receiver.receive())
+
+    def test_onmessage(self):
+        onmessage_queue = six.moves.queue.Queue()
+
+        def onmessage_handler(message):
+            onmessage_queue.put(message)
+
+        request = _create_blocking_request()
+        receiver = msgutil.MessageReceiver(request, onmessage_handler)
+
+        request.connection.put_bytes(b'\x81\x86' + _mask_hybi(b'Hello!'))
+        self.assertEqual('Hello!', onmessage_queue.get())
+
+
+class MessageSenderTest(unittest.TestCase):
+    """Tests the Stream class using MessageSender."""
+    def test_send(self):
+        request = _create_blocking_request()
+        sender = msgutil.MessageSender(request)
+
+        sender.send('World')
+        self.assertEqual(b'\x81\x05World', request.connection.written_data())
+
+    def test_send_nowait(self):
+        # Use a queue to check the bytes written by MessageSender.
+        # request.connection.written_data() cannot be used here because
+        # MessageSender runs in a separate thread.
+        send_queue = six.moves.queue.Queue()
+
+        def write(bytes):
+            send_queue.put(bytes)
+
+        request = _create_blocking_request()
+        request.connection.write = write
+
+        sender = msgutil.MessageSender(request)
+
+        sender.send_nowait('Hello')
+        sender.send_nowait('World')
+        self.assertEqual(b'\x81\x05Hello', send_queue.get())
+        self.assertEqual(b'\x81\x05World', send_queue.get())
+
+
+if __name__ == '__main__':
+    unittest.main()
+
+# vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_stream.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_stream.py
similarity index 76%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/test/test_stream.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_stream.py
index 81acfeb048d..153899d2053 100755
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_stream.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_stream.py
@@ -28,11 +28,9 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 """Tests for stream module."""
 
-
+from __future__ import absolute_import
 import unittest
 
 import set_sys_path  # Update sys.path to locate mod_pywebsocket module.
@@ -43,35 +41,30 @@ from mod_pywebsocket import stream
 
 class StreamTest(unittest.TestCase):
     """A unittest for stream module."""
-
     def test_create_header(self):
         # more, rsv1, ..., rsv4 are all true
         header = stream.create_header(common.OPCODE_TEXT, 1, 1, 1, 1, 1, 1)
-        self.assertEqual('\xf1\x81', header)
+        self.assertEqual(b'\xf1\x81', header)
 
         # Maximum payload size
-        header = stream.create_header(
-            common.OPCODE_TEXT, (1 << 63) - 1, 0, 0, 0, 0, 0)
-        self.assertEqual('\x01\x7f\x7f\xff\xff\xff\xff\xff\xff\xff', header)
+        header = stream.create_header(common.OPCODE_TEXT, (1 << 63) - 1, 0, 0,
+                                      0, 0, 0)
+        self.assertEqual(b'\x01\x7f\x7f\xff\xff\xff\xff\xff\xff\xff', header)
 
         # Invalid opcode 0x10
-        self.assertRaises(ValueError,
-                          stream.create_header,
-                          0x10, 0, 0, 0, 0, 0, 0)
+        self.assertRaises(ValueError, stream.create_header, 0x10, 0, 0, 0, 0,
+                          0, 0)
 
         # Invalid value 0xf passed to more parameter
-        self.assertRaises(ValueError,
-                          stream.create_header,
-                          common.OPCODE_TEXT, 0, 0xf, 0, 0, 0, 0)
+        self.assertRaises(ValueError, stream.create_header, common.OPCODE_TEXT,
+                          0, 0xf, 0, 0, 0, 0)
 
         # Too long payload_length
-        self.assertRaises(ValueError,
-                          stream.create_header,
-                          common.OPCODE_TEXT, 1 << 63, 0, 0, 0, 0, 0)
+        self.assertRaises(ValueError, stream.create_header, common.OPCODE_TEXT,
+                          1 << 63, 0, 0, 0, 0, 0)
 
 
 if __name__ == '__main__':
     unittest.main()
 
-
 # vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_util.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_util.py
similarity index 60%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/test/test_util.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_util.py
index 64ba3f47737..20347941051 100755
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/test/test_util.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_util.py
@@ -28,37 +28,28 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 """Tests for util module."""
+
+from __future__ import absolute_import
 from __future__ import print_function
-
-
 import os
 import random
 import sys
 import unittest
+import struct
 
 import set_sys_path  # Update sys.path to locate mod_pywebsocket module.
 
 from mod_pywebsocket import util
-
+from six.moves import range
+from six import PY3
+from six import int2byte
 
 _TEST_DATA_DIR = os.path.join(os.path.split(__file__)[0], 'testdata')
 
 
 class UtilTest(unittest.TestCase):
     """A unittest for util module."""
-
-    def test_get_stack_trace(self):
-        self.assertEqual('None\n', util.get_stack_trace())
-        try:
-            a = 1 / 0  # Intentionally raise exception.
-        except Exception:
-            trace = util.get_stack_trace()
-            self.failUnless(trace.startswith('Traceback'))
-            self.failUnless(trace.find('ZeroDivisionError') != -1)
-
     def test_prepend_message_to_exception(self):
         exc = Exception('World')
         self.assertEqual('World', str(exc))
@@ -68,68 +59,72 @@ class UtilTest(unittest.TestCase):
     def test_get_script_interp(self):
         cygwin_path = 'c:\\cygwin\\bin'
         cygwin_perl = os.path.join(cygwin_path, 'perl')
-        self.assertEqual(None, util.get_script_interp(
-            os.path.join(_TEST_DATA_DIR, 'README')))
-        self.assertEqual(None, util.get_script_interp(
-            os.path.join(_TEST_DATA_DIR, 'README'), cygwin_path))
-        self.assertEqual('/usr/bin/perl -wT', util.get_script_interp(
-            os.path.join(_TEST_DATA_DIR, 'hello.pl')))
-        self.assertEqual(cygwin_perl + ' -wT', util.get_script_interp(
-            os.path.join(_TEST_DATA_DIR, 'hello.pl'), cygwin_path))
+        self.assertEqual(
+            None, util.get_script_interp(os.path.join(_TEST_DATA_DIR,
+                                                      'README')))
+        self.assertEqual(
+            None,
+            util.get_script_interp(os.path.join(_TEST_DATA_DIR, 'README'),
+                                   cygwin_path))
+        self.assertEqual(
+            '/usr/bin/perl -wT',
+            util.get_script_interp(os.path.join(_TEST_DATA_DIR, 'hello.pl')))
+        self.assertEqual(
+            cygwin_perl + ' -wT',
+            util.get_script_interp(os.path.join(_TEST_DATA_DIR, 'hello.pl'),
+                                   cygwin_path))
 
     def test_hexify(self):
         self.assertEqual('61 7a 41 5a 30 39 20 09 0d 0a 00 ff',
-                         util.hexify('azAZ09 \t\r\n\x00\xff'))
+                         util.hexify(b'azAZ09 \t\r\n\x00\xff'))
 
 
 class RepeatedXorMaskerTest(unittest.TestCase):
     """A unittest for RepeatedXorMasker class."""
-
     def test_mask(self):
         # Sample input e6,97,a5 is U+65e5 in UTF-8
-        masker = util.RepeatedXorMasker('\xff\xff\xff\xff')
-        result = masker.mask('\xe6\x97\xa5')
-        self.assertEqual('\x19\x68\x5a', result)
+        masker = util.RepeatedXorMasker(b'\xff\xff\xff\xff')
+        result = masker.mask(b'\xe6\x97\xa5')
+        self.assertEqual(b'\x19\x68\x5a', result)
 
-        masker = util.RepeatedXorMasker('\x00\x00\x00\x00')
-        result = masker.mask('\xe6\x97\xa5')
-        self.assertEqual('\xe6\x97\xa5', result)
+        masker = util.RepeatedXorMasker(b'\x00\x00\x00\x00')
+        result = masker.mask(b'\xe6\x97\xa5')
+        self.assertEqual(b'\xe6\x97\xa5', result)
 
-        masker = util.RepeatedXorMasker('\xe6\x97\xa5\x20')
-        result = masker.mask('\xe6\x97\xa5')
-        self.assertEqual('\x00\x00\x00', result)
+        masker = util.RepeatedXorMasker(b'\xe6\x97\xa5\x20')
+        result = masker.mask(b'\xe6\x97\xa5')
+        self.assertEqual(b'\x00\x00\x00', result)
 
     def test_mask_twice(self):
-        masker = util.RepeatedXorMasker('\x00\x7f\xff\x20')
+        masker = util.RepeatedXorMasker(b'\x00\x7f\xff\x20')
         # mask[0], mask[1], ... will be used.
-        result = masker.mask('\x00\x00\x00\x00\x00')
-        self.assertEqual('\x00\x7f\xff\x20\x00', result)
+        result = masker.mask(b'\x00\x00\x00\x00\x00')
+        self.assertEqual(b'\x00\x7f\xff\x20\x00', result)
         # mask[2], mask[0], ... will be used for the next call.
-        result = masker.mask('\x00\x00\x00\x00\x00')
-        self.assertEqual('\x7f\xff\x20\x00\x7f', result)
+        result = masker.mask(b'\x00\x00\x00\x00\x00')
+        self.assertEqual(b'\x7f\xff\x20\x00\x7f', result)
 
     def test_mask_large_data(self):
-        masker = util.RepeatedXorMasker('mASk')
-        original = ''.join([chr(i % 256) for i in xrange(1000)])
+        masker = util.RepeatedXorMasker(b'mASk')
+        original = b''.join([util.pack_byte(i % 256) for i in range(1000)])
         result = masker.mask(original)
-        expected = ''.join(
-                [chr((i % 256) ^ ord('mASk'[i % 4])) for i in xrange(1000)])
+        expected = b''.join([
+            util.pack_byte((i % 256) ^ ord('mASk'[i % 4])) for i in range(1000)
+        ])
         self.assertEqual(expected, result)
 
-        masker = util.RepeatedXorMasker('MaSk')
-        first_part = 'The WebSocket Protocol enables two-way communication.'
+        masker = util.RepeatedXorMasker(b'MaSk')
+        first_part = b'The WebSocket Protocol enables two-way communication.'
         result = masker.mask(first_part)
         self.assertEqual(
-                '\x19\t6K\x1a\x0418"\x028\x0e9A\x03\x19"\x15<\x08"\rs\x0e#'
-                '\x001\x07(\x12s\x1f:\x0e~\x1c,\x18s\x08"\x0c>\x1e#\x080\n9'
-                '\x08<\x05c',
-                result)
-        second_part = 'It has two parts: a handshake and the data transfer.'
+            b'\x19\t6K\x1a\x0418"\x028\x0e9A\x03\x19"\x15<\x08"\rs\x0e#'
+            b'\x001\x07(\x12s\x1f:\x0e~\x1c,\x18s\x08"\x0c>\x1e#\x080\n9'
+            b'\x08<\x05c', result)
+        second_part = b'It has two parts: a handshake and the data transfer.'
         result = masker.mask(second_part)
         self.assertEqual(
-                "('K%\x00 K9\x16<K=\x00!\x1f>[s\nm\t2\x05)\x12;\n&\x04s\n#"
-                "\x05s\x1f%\x04s\x0f,\x152K9\x132\x05>\x076\x19c",
-                result)
+            b"('K%\x00 K9\x16<K=\x00!\x1f>[s\nm\t2\x05)\x12;\n&\x04s\n#"
+            b"\x05s\x1f%\x04s\x0f,\x152K9\x132\x05>\x076\x19c", result)
 
 
 def get_random_section(source, min_num_chunks):
@@ -138,8 +133,8 @@ def get_random_section(source, min_num_chunks):
 
     while bytes_chunked < len(source):
         chunk_size = random.randint(
-            1,
-            min(len(source) / min_num_chunks, len(source) - bytes_chunked))
+            1, min(len(source) / min_num_chunks,
+                   len(source) - bytes_chunked))
         chunk = source[bytes_chunked:bytes_chunked + chunk_size]
         chunks.append(chunk)
         bytes_chunked += chunk_size
@@ -149,9 +144,8 @@ def get_random_section(source, min_num_chunks):
 
 class InflaterDeflaterTest(unittest.TestCase):
     """A unittest for _Inflater and _Deflater class."""
-
     def test_inflate_deflate_default(self):
-        input = b'hello' + '-' * 30000 + b'hello'
+        input = b'hello' + b'-' * 30000 + b'hello'
         inflater15 = util._Inflater(15)
         deflater15 = util._Deflater(15)
         inflater8 = util._Inflater(8)
@@ -169,8 +163,8 @@ class InflaterDeflaterTest(unittest.TestCase):
 
     def test_random_section(self):
         random.seed(a=0)
-        source = ''.join(
-            [chr(random.randint(0, 255)) for i in xrange(100 * 1024)])
+        source = b''.join(
+            [int2byte(random.randint(0, 255)) for i in range(100 * 1024)])
 
         chunked_input = get_random_section(source, 10)
         print("Input chunk sizes: %r" % [len(c) for c in chunked_input])
@@ -179,23 +173,22 @@ class InflaterDeflaterTest(unittest.TestCase):
         compressed = []
         for chunk in chunked_input:
             compressed.append(deflater.compress(chunk))
-        compressed.append(deflater.compress_and_finish(''))
+        compressed.append(deflater.compress_and_finish(b''))
 
         chunked_expectation = get_random_section(source, 10)
-        print ("Expectation chunk sizes: %r" %
-               [len(c) for c in chunked_expectation])
+        print("Expectation chunk sizes: %r" %
+              [len(c) for c in chunked_expectation])
 
         inflater = util._Inflater(15)
-        inflater.append(''.join(compressed))
+        inflater.append(b''.join(compressed))
         for chunk in chunked_expectation:
             decompressed = inflater.decompress(len(chunk))
             self.assertEqual(chunk, decompressed)
 
-        self.assertEqual('', inflater.decompress(-1))
+        self.assertEqual(b'', inflater.decompress(-1))
 
 
 if __name__ == '__main__':
     unittest.main()
 
-
 # vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/test/testdata/README b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/README
similarity index 100%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/test/testdata/README
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/README
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/test/testdata/handlers/abort_by_user_wsh.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/abort_by_user_wsh.py
similarity index 99%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/test/testdata/handlers/abort_by_user_wsh.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/abort_by_user_wsh.py
index 367f9930f78..63cb541bb7e 100644
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/test/testdata/handlers/abort_by_user_wsh.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/abort_by_user_wsh.py
@@ -27,7 +27,6 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 from mod_pywebsocket import handshake
 
 
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/test/testdata/handlers/blank_wsh.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/blank_wsh.py
similarity index 99%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/test/testdata/handlers/blank_wsh.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/blank_wsh.py
index 7f87c6af23d..b398e96778d 100644
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/test/testdata/handlers/blank_wsh.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/blank_wsh.py
@@ -27,5 +27,4 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 # intentionally left blank
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/test/testdata/handlers/origin_check_wsh.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/origin_check_wsh.py
similarity index 91%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/test/testdata/handlers/origin_check_wsh.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/origin_check_wsh.py
index 2c139fa176c..bf6442e65b9 100644
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/test/testdata/handlers/origin_check_wsh.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/origin_check_wsh.py
@@ -35,8 +35,9 @@ def web_socket_do_extra_handshake(request):
 
 
 def web_socket_transfer_data(request):
-    request.connection.write('origin_check_wsh.py is called for %s, %s' %
-                             (request.ws_resource, request.ws_protocol))
+    message = 'origin_check_wsh.py is called for %s, %s' % (
+        request.ws_resource, request.ws_protocol)
+    request.connection.write(message.encode('UTF-8'))
 
 
 # vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/test/testdata/handlers/sub/exception_in_transfer_wsh.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/exception_in_transfer_wsh.py
similarity index 99%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/test/testdata/handlers/sub/exception_in_transfer_wsh.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/exception_in_transfer_wsh.py
index b982d0231ef..54390994d71 100644
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/test/testdata/handlers/sub/exception_in_transfer_wsh.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/exception_in_transfer_wsh.py
@@ -26,8 +26,6 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 """Exception in web_socket_transfer_data().
 """
 
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/test/testdata/handlers/sub/no_wsh_at_the_end.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/no_wsh_at_the_end.py
similarity index 90%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/test/testdata/handlers/sub/no_wsh_at_the_end.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/no_wsh_at_the_end.py
index 17e7be1802e..ebfddb74495 100644
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/test/testdata/handlers/sub/no_wsh_at_the_end.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/no_wsh_at_the_end.py
@@ -26,8 +26,6 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 """Correct signatures, wrong file name.
 """
 
@@ -37,9 +35,9 @@ def web_socket_do_extra_handshake(request):
 
 
 def web_socket_transfer_data(request):
-    request.connection.write(
-            'sub/no_wsh_at_the_end.py is called for %s, %s' %
-            (request.ws_resource, request.ws_protocol))
+    message = 'sub/no_wsh_at_the_end.py is called for %s, %s' % (
+        request.ws_resource, request.ws_protocol)
+    request.connection.write(message.encode('UTF-8'))
 
 
 # vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/test/testdata/handlers/sub/non_callable_wsh.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/non_callable_wsh.py
similarity index 99%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/test/testdata/handlers/sub/non_callable_wsh.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/non_callable_wsh.py
index 26352eb4ca2..8afcfa97a95 100644
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/test/testdata/handlers/sub/non_callable_wsh.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/non_callable_wsh.py
@@ -26,14 +26,10 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 """Non-callable handlers.
 """
 
-
 web_socket_do_extra_handshake = True
 web_socket_transfer_data = 1
 
-
 # vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/test/testdata/handlers/sub/plain_wsh.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/plain_wsh.py
similarity index 88%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/test/testdata/handlers/sub/plain_wsh.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/plain_wsh.py
index db3ff693025..8a7db1e5ac3 100644
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/test/testdata/handlers/sub/plain_wsh.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/plain_wsh.py
@@ -33,8 +33,9 @@ def web_socket_do_extra_handshake(request):
 
 
 def web_socket_transfer_data(request):
-    request.connection.write('sub/plain_wsh.py is called for %s, %s' %
-                             (request.ws_resource, request.ws_protocol))
+    message = 'sub/plain_wsh.py is called for %s, %s' % (request.ws_resource,
+                                                         request.ws_protocol)
+    request.connection.write(message.encode('UTF-8'))
 
 
 # vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/test/testdata/handlers/sub/wrong_handshake_sig_wsh.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/wrong_handshake_sig_wsh.py
similarity index 90%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/test/testdata/handlers/sub/wrong_handshake_sig_wsh.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/wrong_handshake_sig_wsh.py
index 6bf659bc9af..cebb0da1ab6 100644
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/test/testdata/handlers/sub/wrong_handshake_sig_wsh.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/wrong_handshake_sig_wsh.py
@@ -26,8 +26,6 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 """Wrong web_socket_do_extra_handshake signature.
 """
 
@@ -37,9 +35,9 @@ def no_web_socket_do_extra_handshake(request):
 
 
 def web_socket_transfer_data(request):
-    request.connection.write(
-            'sub/wrong_handshake_sig_wsh.py is called for %s, %s' %
-             (request.ws_resource, request.ws_protocol))
+    message = 'sub/wrong_handshake_sig_wsh.py is called for %s, %s' % (
+        request.ws_resource, request.ws_protocol)
+    request.connection.write(message.encode('UTF-8'))
 
 
 # vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/test/testdata/handlers/sub/wrong_transfer_sig_wsh.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/wrong_transfer_sig_wsh.py
similarity index 90%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/test/testdata/handlers/sub/wrong_transfer_sig_wsh.py
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/wrong_transfer_sig_wsh.py
index e0e2e550794..ad27d6bcfee 100644
--- a/tests/wpt/web-platform-tests/tools/pywebsocket/test/testdata/handlers/sub/wrong_transfer_sig_wsh.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/handlers/sub/wrong_transfer_sig_wsh.py
@@ -26,8 +26,6 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 """Wrong web_socket_transfer_data() signature.
 """
 
@@ -37,9 +35,9 @@ def web_socket_do_extra_handshake(request):
 
 
 def no_web_socket_transfer_data(request):
-    request.connection.write(
-            'sub/wrong_transfer_sig_wsh.py is called for %s, %s' %
-            (request.ws_resource, request.ws_protocol))
+    message = 'sub/wrong_transfer_sig_wsh.py is called for %s, %s' % (
+        request.ws_resource, request.ws_protocol)
+    request.connection.write(message.encode('UTF-8'))
 
 
 # vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/pywebsocket/test/testdata/hello.pl b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/hello.pl
similarity index 100%
rename from tests/wpt/web-platform-tests/tools/pywebsocket/test/testdata/hello.pl
rename to tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/testdata/hello.pl
diff --git a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py
index cf4c5fd35fd..9885e99c4f7 100644
--- a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py
+++ b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py
@@ -373,10 +373,8 @@ class Session(object):
                  port,
                  url_prefix="/",
                  capabilities=None,
-                 timeout=None,
                  extension=None):
-        self.transport = transport.HTTPWireProtocol(
-            host, port, url_prefix, timeout=timeout)
+        self.transport = transport.HTTPWireProtocol(host, port, url_prefix)
         self.requested_capabilities = capabilities
         self.capabilities = None
         self.session_id = None
diff --git a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/transport.py b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/transport.py
index c33582db1a9..edaf3186039 100644
--- a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/transport.py
+++ b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/transport.py
@@ -75,7 +75,7 @@ class HTTPWireProtocol(object):
         # => webdriver.Element
     """
 
-    def __init__(self, host, port, url_prefix="/", timeout=None):
+    def __init__(self, host, port, url_prefix="/"):
         """
         Construct interface for communicating with the remote server.
 
@@ -85,9 +85,8 @@ class HTTPWireProtocol(object):
         self.host = host
         self.port = port
         self.url_prefix = url_prefix
-
         self._conn = None
-        self._timeout = timeout
+        self._last_request_is_blocked = False
 
     def __del__(self):
         self.close()
@@ -102,10 +101,11 @@ class HTTPWireProtocol(object):
         """Gets the current HTTP connection, or lazily creates one."""
         if not self._conn:
             conn_kwargs = {}
-            if self._timeout is not None:
-                conn_kwargs["timeout"] = self._timeout
             if not PY3:
                 conn_kwargs["strict"] = True
+            # We are not setting an HTTP timeout other than the default
+            # because the timeouts are handled externally by the runner
+            # and can be different for each type of test.
             self._conn = HTTPConnection(self.host, self.port, **conn_kwargs)
 
         return self._conn
@@ -172,7 +172,15 @@ class HTTPWireProtocol(object):
                 raise ValueError("Failed to encode request body as JSON:\n"
                     "%s" % json.dumps(body, indent=2))
 
+        # When the timeout triggers, the TestRunnerManager thread will reuse
+        # this connection to check if the WebDriver its alive and we may end
+        # raising an httplib.CannotSendRequest exception if the WebDriver is
+        # not responding and this httplib.request() call is blocked on the
+        # runner thread. We use the boolean below to check for that and restart
+        # the connection in that case.
+        self._last_request_is_blocked = True
         response = self._request(method, uri, payload, headers)
+        self._last_request_is_blocked = False
         return Response.from_http(response, decoder=decoder, **codec_kwargs)
 
     def _request(self, method, uri, payload, headers=None):
@@ -185,7 +193,7 @@ class HTTPWireProtocol(object):
 
         url = self.url(uri)
 
-        if self._has_unread_data():
+        if self._last_request_is_blocked or self._has_unread_data():
             self.close()
         self.connection.request(method, url, payload, headers)
         return self.connection.getresponse()
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/LICENSE b/tests/wpt/web-platform-tests/tools/wptrunner/LICENSE
deleted file mode 100644
index 45896e6be2b..00000000000
--- a/tests/wpt/web-platform-tests/tools/wptrunner/LICENSE
+++ /dev/null
@@ -1,30 +0,0 @@
-W3C 3-clause BSD License
-
-http://www.w3.org/Consortium/Legal/2008/03-bsd-license.html
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of works must retain the original copyright notice,
-  this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the original copyright
-  notice, this list of conditions and the following disclaimer in the
-  documentation and/or other materials provided with the distribution.
-
-* Neither the name of the W3C nor the names of its contributors may be
-  used to endorse or promote products derived from this work without
-  specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/base.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/base.py
index e6b44f02641..cb7323ece0a 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/base.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/base.py
@@ -163,10 +163,14 @@ class TimedRunner(object):
                 self.result = False, ("INTERNAL-ERROR", "%s.run_func didn't set a result" %
                                       self.__class__.__name__)
             else:
-                message = "Executor hit external timeout (this may indicate a hang)\n"
-                # get a traceback for the current stack of the executor thread
-                message += "".join(traceback.format_stack(sys._current_frames()[executor.ident]))
-                self.result = False, ("EXTERNAL-TIMEOUT", message)
+                if self.protocol.is_alive():
+                    message = "Executor hit external timeout (this may indicate a hang)\n"
+                    # get a traceback for the current stack of the executor thread
+                    message += "".join(traceback.format_stack(sys._current_frames()[executor.ident]))
+                    self.result = False, ("EXTERNAL-TIMEOUT", message)
+                else:
+                    self.logger.info("Browser not responding, setting status to CRASH")
+                    self.result = False, ("CRASH", None)
         elif self.result[1] is None:
             # We didn't get any data back from the test, so check if the
             # browser is still responsive
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py
index da763074e2e..eccba8c4a12 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py
@@ -301,11 +301,19 @@ class WebDriverProtocol(Protocol):
         self.webdriver = None
 
     def is_alive(self):
+        socket_previous_timeout = socket.getdefaulttimeout()
         try:
-            # Get a simple property over the connection
+            # Get a simple property over the connection, with 2 seconds of timeout
+            # that should be more than enough to check if the WebDriver its
+            # still alive, and allows to complete the check within the testrunner
+            # 5 seconds of extra_timeout we have as maximum to end the test before
+            # the external timeout from testrunner triggers.
+            socket.setdefaulttimeout(2)
             self.webdriver.window_handle
-        except (socket.timeout, client.UnknownErrorException):
+        except (socket.timeout, client.UnknownErrorException, client.InvalidSessionIdException):
             return False
+        finally:
+            socket.setdefaulttimeout(socket_previous_timeout)
         return True
 
     def after_connect(self):
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/sync.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/sync.py
index 0d75a1232fc..0a41f706ebc 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/sync.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/sync.py
@@ -10,37 +10,6 @@ from .tree import Commit
 
 here = os.path.abspath(os.path.split(__file__)[0])
 
-bsd_license = """W3C 3-clause BSD License
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of works must retain the original copyright notice, this
-  list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the original copyright
-  notice, this list of conditions and the following disclaimer in the
-  documentation and/or other materials provided with the distribution.
-
-* Neither the name of the W3C nor the names of its contributors may be
-  used to endorse or promote products derived from this work without
-  specific prior written permission.
-
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-"""
-
 
 def copy_wpt_tree(tree, dest, excludes=None, includes=None):
     """Copy the working copy of a Tree to a destination directory.
@@ -84,16 +53,6 @@ def copy_wpt_tree(tree, dest, excludes=None, includes=None):
         dest_path = os.path.join(dest, destination, os.path.split(source)[1])
         shutil.copy2(source_path, dest_path)
 
-    add_license(dest)
-
-
-def add_license(dest):
-    """Write the bsd license string to a LICENSE file.
-
-    :param dest: Directory in which to place the LICENSE file."""
-    with open(os.path.join(dest, "LICENSE"), "w") as f:
-        f.write(bsd_license)
-
 
 class UpdateCheckout(Step):
     """Pull changes from upstream into the local sync tree."""
diff --git a/tests/wpt/web-platform-tests/tools/wptserve/LICENSE b/tests/wpt/web-platform-tests/tools/wptserve/LICENSE
deleted file mode 100644
index 45896e6be2b..00000000000
--- a/tests/wpt/web-platform-tests/tools/wptserve/LICENSE
+++ /dev/null
@@ -1,30 +0,0 @@
-W3C 3-clause BSD License
-
-http://www.w3.org/Consortium/Legal/2008/03-bsd-license.html
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of works must retain the original copyright notice,
-  this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the original copyright
-  notice, this list of conditions and the following disclaimer in the
-  documentation and/or other materials provided with the distribution.
-
-* Neither the name of the W3C nor the names of its contributors may be
-  used to endorse or promote products derived from this work without
-  specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_response.py b/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_response.py
index d8d64d54ccc..6e947e478d9 100644
--- a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_response.py
+++ b/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_response.py
@@ -1,11 +1,11 @@
-import sys
 import os
 import unittest
 import json
 from io import BytesIO
 
 import pytest
-from six import create_bound_method
+from six import create_bound_method, PY3
+from six.moves.http_client import BadStatusLine
 
 wptserve = pytest.importorskip("wptserve")
 from .base import TestUsingServer, TestUsingH2Server, doc_root
@@ -167,7 +167,6 @@ class TestResponse(TestUsingServer):
         self.server.router.register(*route)
         self.request(route[1])
 
-    @pytest.mark.xfail(sys.version_info >= (3,), reason="py3 urllib doesn't handle invalid HTTP very well")
     def test_write_raw_contents_invalid_http(self):
         resp_content = b"INVALID HTTP"
 
@@ -177,9 +176,14 @@ class TestResponse(TestUsingServer):
 
         route = ("GET", "/test/test_write_raw_content", handler)
         self.server.router.register(*route)
-        resp = self.request(route[1])
-        assert resp.read() == resp_content
 
+        try:
+            resp = self.request(route[1])
+            assert resp.read() == resp_content
+        except BadStatusLine as e:
+            # In Python3, an invalid HTTP request should throw BadStatusLine.
+            assert PY3
+            assert str(e) == resp_content.decode('utf-8')
 
 class TestH2Response(TestUsingH2Server):
     def test_write_without_ending_stream(self):
diff --git a/tests/wpt/web-platform-tests/web-nfc/NDEFRecord_constructor.https.html b/tests/wpt/web-platform-tests/web-nfc/NDEFRecord_constructor.https.html
index 4772407baaf..6d6b8117ef0 100644
--- a/tests/wpt/web-platform-tests/web-nfc/NDEFRecord_constructor.https.html
+++ b/tests/wpt/web-platform-tests/web-nfc/NDEFRecord_constructor.https.html
@@ -406,10 +406,10 @@
     new Uint8Array(buffer).set([1, 2, 3, 4]);
     const encoder = new TextEncoder();
     const uri_record = createUrlRecord(test_url_data);
-    const title_record = createTextRecord(test_text_data);
-    const type_record = createRecord(":t", encoder.encode("image/gif"));
-    const size_record = createRecord(":s", new Uint32Array([4096]));
-    const action_record = createRecord(":act", new Uint8Array([0]));
+    const title_record = createTextRecord(test_text_data, 'utf-8', 'en');
+    const type_record = createRecord(':t', encoder.encode("image/gif"));
+    const size_record = createRecord(':s', new Uint32Array([4096]));
+    const action_record = createRecord(':act', new Uint8Array([3]));
     const icon_record = createRecord("mime", buffer, test_record_id, 'image/gif');
     const payload_message = createMessage([
         uri_record, title_record, type_record, size_record, action_record, icon_record]);
@@ -438,6 +438,7 @@
           assert_equals(record.encoding, 'utf-8', 'title record\'s encoding');
           assert_equals(record.lang, 'en', 'title record\'s lang');
           assert_equals(decoder.decode(record.data), test_text_data, 'title record\'s data');
+          break;
         case ':t':
           assert_equals(record.mediaType, null, 'type record\'s mediaType');
           assert_equals(record.id, null, 'type record\'s id');
@@ -447,16 +448,16 @@
           assert_equals(record.mediaType, null, 'size record\'s mediaType');
           assert_equals(record.id, null, 'size record\'s id');
           assert_equals(record.data.byteLength, 4, 'byteLength of size record\'s data');
-          assert_equals(record.data.getUint32(0), 4096, 'value of size record\'s data');
+          assert_equals(new Uint32Array(record.data.buffer)[0], 4096, 'value of size record\'s data');
           break;
         case ':act':
           assert_equals(record.mediaType, null, 'action record\'s mediaType');
           assert_equals(record.id, null, 'action record\'s id');
           assert_equals(record.data.byteLength, 1, 'byteLength of action record\'s data');
-          assert_equals(record.data.getUint8(0), 0, 'value of action record\'s data');
+          assert_equals(new Uint8Array(record.data.buffer)[0], 3, 'value of action record\'s data');
           break;
         case 'mime':
-          assert_equals(record.mediaType, image/gif, 'icon record\'s mediaType');
+          assert_equals(record.mediaType, 'image/gif', 'icon record\'s mediaType');
           assert_equals(record.id, test_record_id, 'icon record\'s id');
           assert_array_equals(new Uint8Array(record.data.buffer), [1, 2, 3, 4],
               'icon record\'s mediaType');
@@ -473,20 +474,20 @@
   test(() => {
     const uri_record = createUrlRecord(test_url_data);
     const smart_poster_record = createRecord(
-        'smart-poster', createMessage([uri_record]), "dummy_record_id");
+        'smart-poster', createMessage([uri_record]), 'dummy_record_id');
     const record = new NDEFRecord(smart_poster_record);
     assert_equals(record.recordType, 'smart-poster', 'recordType');
     assert_equals(record.mediaType, null, 'mediaType');
     assert_equals(record.id, 'dummy_record_id', 'id');
-    const embedded_record = record.toRecords();
+    const embedded_records = record.toRecords();
 
     // smart-poster record only contains a uri record.
-    assert_equals(embedded_record.length, 1, 'length');
+    assert_equals(embedded_records.length, 1, 'length');
     const decoder = new TextDecoder();
-    assert_equals(embedded_record.recordType, 'url', 'uri record\'s recordType');
-    assert_equals(embedded_record.mediaType, null, 'uri record\'s mediaType');
-    assert_equals(embedded_record.id, test_record_id, 'uri record\'s id');
-    assert_equals(decoder.decode(embedded_record.data), test_url_data, 'uri record\'s data');
+    assert_equals(embedded_records[0].recordType, 'url', 'uri record\'s recordType');
+    assert_equals(embedded_records[0].mediaType, null, 'uri record\'s mediaType');
+    assert_equals(embedded_records[0].id, test_record_id, 'uri record\'s id');
+    assert_equals(decoder.decode(embedded_records[0].data), test_url_data, 'uri record\'s data');
   }, 'NDEFRecord constructor with smart-poster record type that contains only a mandatory uri record');
 
   test(() => {
@@ -532,61 +533,41 @@
   test(() => {
     const encoder = new TextEncoder();
     const uri_record = createUrlRecord(test_url_data);
-    const title_record = createTextRecord(test_text_data);
-    const type_record = createRecord(":t", encoder.encode("image/gif"));
-    const size_record = createRecord(":s", new Uint32Array([4096]));
-    const action_record = createRecord(":act", new Uint8Array([0]));
+    const title_record = createTextRecord(test_text_data, 'utf-8', 'en');
+    const type_record = createRecord(':t', encoder.encode("image/gif"));
+    const size_record = createRecord(':s', new Uint32Array([4096]));
+    const action_record = createRecord(':act', new Uint8Array([0]));
     const icon_record = createRecord(
         "mime", test_buffer_data, test_record_id, 'image/gif');
 
-    const invalid_datas = [
-      // NDEFRecord.data for smart-poster record must be a NDEFMessageInit.
-      "A string is not a NDEFMessageInit",
-      test_buffer_data,
-      // NDEFRecord.data for smart-poster record must contain a URI record.
-      createMessage([title_record, type_record, size_record,
-          action_record, icon_record]),
-      // NDEFRecord.data for smart-poster record must not contain more than
-      // one uri record, type record, size record or action record.
-      createMessage([uri_record, title_record, type_record, size_record,
+    const invalid_data_list = [
+      {data: 'A string is not a NDEFMessageInit', message: 'A string is not allowed.'},
+      {data: test_buffer_data, message: 'An ArrayBuffer is not allowed.'},
+      {data: createMessage([title_record, type_record, size_record, action_record, icon_record]),
+        message: 'Must contain a URI record.'},
+      {data: createMessage([uri_record, title_record, type_record, size_record,
           action_record, icon_record, uri_record]),
-      createMessage([uri_record, title_record, type_record, size_record,
+        message: 'Must not contain more than one uri record.'},
+      {data: createMessage([uri_record, title_record, type_record, size_record,
           action_record, icon_record, type_record]),
-      createMessage([uri_record, title_record, type_record, size_record,
+        message: 'Must not contain more than one type record.'},
+      {data: createMessage([uri_record, title_record, type_record, size_record,
           action_record, icon_record, size_record]),
-      createMessage([uri_record, title_record, type_record, size_record,
+        message: 'Must not contain more than one size record.'},
+      {data: createMessage([uri_record, title_record, type_record, size_record,
           action_record, icon_record, action_record]),
-      // NDEFRecord.data for smart-poster record contains a size record must
-      // have a data of type 4-byte 32 bit unsigned integer.
-      createMessage([uri_record, title_record, type_record, action_record,
+        message: 'Must not contain more than one action record.'},
+      {data: createMessage([uri_record, title_record, type_record, action_record,
           icon_record, createRecord(":s", new Uint8Array([1]))]),
-      // NDEFRecord.data for smart-poster record contains an action record must
-      // have a data of type 1-byte 8 bit unsigned integer.
-      createMessage([uri_record, title_record, type_record, size_record,
+        message: 'Size record must have payload as 4-byte 32 bit unsigned integer.'},
+      {data: createMessage([uri_record, title_record, type_record, size_record,
           icon_record, createRecord(":act", new Uint32Array([0]))]),
-      // NDEFRecord.data for smart-poster record contains an icon record must
-      // have a data starts with 'image' or 'video'.
-      createMessage([uri_record, title_record, type_record, size_record,
-          action_record, createMimeRecord(test_buffer_data)]),
-      // NDEFRecord.data for smart-poster record must not contain empty record.
-      createMessage([uri_record, title_record, type_record, size_record,
-          action_record, icon_record, createRecord('empty')]),
-      // NDEFRecord.data for smart-poster record must not contain absolute-url record.
-      createMessage([uri_record, title_record, type_record, size_record,
-          action_record, icon_record, createUrlRecord(test_url_data, true)]),
-      // NDEFRecord.data for smart-poster record must not contain external record.
-      createMessage([uri_record, title_record, type_record, size_record,
-          action_record, icon_record, createRecord('example.com:foo', test_buffer_data)]),
-      // NDEFRecord.data for smart-poster record must not contain unknown record.
-      createMessage([uri_record, title_record, type_record, size_record,
-          action_record, icon_record, createUnknownRecord(test_buffer_data)]),
-      // NDEFRecord.data for smart-poster record must contain only well-known local type.
-      createMessage([uri_record, title_record, type_record, size_record,
-          action_record, icon_record, createRecord(':notWellknownLocalType', test_buffer_data)])
+        message: 'Action record must have payload as 1-byte 8 bit unsigned integer.'}
     ];
 
-    invalid_datas.forEach(data => {
-      assert_throws_js(TypeError, () => new NDEFRecord(createRecord('smart-poster', data)));
+    invalid_data_list.forEach(entry => {
+      assert_throws_js(TypeError, () => new NDEFRecord(createRecord('smart-poster', entry.data)),
+          entry.message);
     });
   }, "NDEFRecord constructor for smart-poster record with invalid embedded records.");
 
diff --git a/tests/wpt/web-platform-tests/webauthn/createcredential-badargs-attestation.https.html b/tests/wpt/web-platform-tests/webauthn/createcredential-badargs-attestation.https.html
index 6bce3233a1c..1bdebbbf2b2 100644
--- a/tests/wpt/web-platform-tests/webauthn/createcredential-badargs-attestation.https.html
+++ b/tests/wpt/web-platform-tests/webauthn/createcredential-badargs-attestation.https.html
@@ -5,6 +5,8 @@
 <link rel="help" href="https://w3c.github.io/webauthn/#iface-credential">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
 <script src=helpers.js></script>
 <body></body>
 <script>
@@ -21,4 +23,4 @@ standardSetup(function() {
 
 /* JSHINT */
 /* globals standardSetup, CreateCredentialsTest */
-</script>
\ No newline at end of file
+</script>
diff --git a/tests/wpt/web-platform-tests/webauthn/createcredential-badargs-authnrselection.https.html b/tests/wpt/web-platform-tests/webauthn/createcredential-badargs-authnrselection.https.html
index 87bdb040055..5da0745734f 100644
--- a/tests/wpt/web-platform-tests/webauthn/createcredential-badargs-authnrselection.https.html
+++ b/tests/wpt/web-platform-tests/webauthn/createcredential-badargs-authnrselection.https.html
@@ -6,6 +6,8 @@
 <link rel="help" href="https://w3c.github.io/webauthn/#iface-credential">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
 <script src=helpers.js></script>
 <body></body>
 <script>
@@ -53,13 +55,19 @@ standardSetup(function() {
     new CreateCredentialsTest("options.publicKey.authenticatorSelection", authnrSelBadAttachEmptyStr).runTest("Bad AuthenticatorSelectionCriteria: authenticatorSelection attachment is empty string", TypeError);
     new CreateCredentialsTest("options.publicKey.authenticatorSelection", authnrSelBadAttachEmptyObj).runTest("Bad AuthenticatorSelectionCriteria: authenticatorSelection attachment is empty object", TypeError);
     new CreateCredentialsTest("options.publicKey.authenticatorSelection", authnrSelBadAttachNull).runTest("Bad AuthenticatorSelectionCriteria: authenticatorSelection attachment is null", TypeError);
-    // XXX: assumes authnr is behaving like most U2F authnrs; really depends on the authnr or mock configuration
-    new CreateCredentialsTest("options.publicKey.authenticatorSelection", authnrSelAttachPlatform).runTest("Bad AuthenticatorSelectionCriteria: authenticatorSelection attachment platform", "NotAllowedError");
+    // the physically plugged-in or virtual authenticator should be a cross-platform authenticator.
+    new CreateCredentialsTest("options.publicKey.authenticatorSelection", authnrSelAttachPlatform)
+      .modify("options.publicKey.timeout", 300)
+      .runTest("Bad AuthenticatorSelectionCriteria: authenticatorSelection attachment platform", "NotAllowedError");
 
     // authenticatorSelection bad requireResidentKey values
-   // XXX: assumes authnr is behaving like most U2F authnrs; really depends on the authnr or mock configuration
-    new CreateCredentialsTest("options.publicKey.authenticatorSelection", authnrSelRkTrue).runTest("Bad AuthenticatorSelectionCriteria: authenticatorSelection residentKey true", "NotAllowedError");
-    new CreateCredentialsTest("options.publicKey.authenticatorSelection", authnrSelRkBadString).runTest("Bad AuthenticatorSelectionCriteria: authenticatorSelection residentKey is string", TypeError);
+    // the physically plugged-in or virtual authenticator should not support resident keys
+    new CreateCredentialsTest("options.publicKey.authenticatorSelection", authnrSelRkTrue)
+      .modify("options.publicKey.timeout", 300)
+      .runTest("Bad AuthenticatorSelectionCriteria: authenticatorSelection residentKey true", "NotAllowedError");
+    new CreateCredentialsTest("options.publicKey.authenticatorSelection", authnrSelRkBadString)
+      .modify("options.publicKey.timeout", 300)
+      .runTest("Bad AuthenticatorSelectionCriteria: authenticatorSelection residentKey is string", TypeError);
     // TODO: not sure if rk is "boolean" or "truthy"; add test cases if it should only accept boolean values
 
     // authenticatorSelection bad userVerification values
@@ -67,10 +75,13 @@ standardSetup(function() {
     new CreateCredentialsTest("options.publicKey.authenticatorSelection", authnrSelBadUvEmptyObj).runTest("Bad AuthenticatorSelectionCriteria: authenticatorSelection userVerification empty object", TypeError);
     new CreateCredentialsTest("options.publicKey.authenticatorSelection", authnrSelBadUvStr).runTest("Bad AuthenticatorSelectionCriteria: authenticatorSelection userVerification bad value", TypeError);
     new CreateCredentialsTest("options.publicKey.authenticatorSelection", authnrSelBadUvNull).runTest("Bad AuthenticatorSelectionCriteria: authenticatorSelection userVerification null", TypeError);
-    // XXX: assumes this is a mock authenticator the properly reports that it is not doing userVerfication
-    new CreateCredentialsTest("options.publicKey.authenticatorSelection", authnrSelUvRequired).runTest("Bad AuthenticatorSelectionCriteria: authenticatorSelection userVerification required", "NotAllowedError");
+    // the physically plugged-in or virtual authenticator should not support user verification
+    new CreateCredentialsTest("options.publicKey.authenticatorSelection", authnrSelUvRequired)
+      // this assertion will time out the test under default parameters since the browser will wait for a platform authenticator
+      .modify("options.publicKey.timeout", 300)
+      .runTest("Bad AuthenticatorSelectionCriteria: authenticatorSelection userVerification required", "NotAllowedError");
 });
 
 /* JSHINT */
 /* globals standardSetup, CreateCredentialsTest, cloneObject */
-</script>
\ No newline at end of file
+</script>
diff --git a/tests/wpt/web-platform-tests/webauthn/createcredential-badargs-challenge.https.html b/tests/wpt/web-platform-tests/webauthn/createcredential-badargs-challenge.https.html
index 554fc0ec43b..4fa41df11dd 100644
--- a/tests/wpt/web-platform-tests/webauthn/createcredential-badargs-challenge.https.html
+++ b/tests/wpt/web-platform-tests/webauthn/createcredential-badargs-challenge.https.html
@@ -6,6 +6,8 @@
 <link rel="help" href="https://w3c.github.io/webauthn/#iface-credential">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
 <script src=helpers.js></script>
 <body></body>
 <script>
@@ -22,4 +24,4 @@ standardSetup(function() {
 
 /* JSHINT */
 /* globals standardSetup, CreateCredentialsTest */
-</script>
\ No newline at end of file
+</script>
diff --git a/tests/wpt/web-platform-tests/webauthn/createcredential-badargs-rp.https.html b/tests/wpt/web-platform-tests/webauthn/createcredential-badargs-rp.https.html
index 890ba21a81b..cbd86b8f083 100644
--- a/tests/wpt/web-platform-tests/webauthn/createcredential-badargs-rp.https.html
+++ b/tests/wpt/web-platform-tests/webauthn/createcredential-badargs-rp.https.html
@@ -6,6 +6,8 @@
 <link rel="help" href="https://w3c.github.io/webauthn/#iface-credential">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
 <script src=helpers.js></script>
 <body></body>
 <script>
@@ -43,4 +45,4 @@ standardSetup(function() {
 
 /* JSHINT */
 /* globals standardSetup, CreateCredentialsTest */
-</script>
\ No newline at end of file
+</script>
diff --git a/tests/wpt/web-platform-tests/webauthn/createcredential-badargs-user.https.html b/tests/wpt/web-platform-tests/webauthn/createcredential-badargs-user.https.html
index 070a5c77dea..e4872425717 100644
--- a/tests/wpt/web-platform-tests/webauthn/createcredential-badargs-user.https.html
+++ b/tests/wpt/web-platform-tests/webauthn/createcredential-badargs-user.https.html
@@ -6,6 +6,8 @@
 <link rel="help" href="https://w3c.github.io/webauthn/#iface-credential">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
 <script src=helpers.js></script>
 <body></body>
 <script>
diff --git a/tests/wpt/web-platform-tests/webauthn/createcredential-excludecredentials.https.html b/tests/wpt/web-platform-tests/webauthn/createcredential-excludecredentials.https.html
index f084d00864f..3a5af481fca 100644
--- a/tests/wpt/web-platform-tests/webauthn/createcredential-excludecredentials.https.html
+++ b/tests/wpt/web-platform-tests/webauthn/createcredential-excludecredentials.https.html
@@ -6,6 +6,8 @@
 <link rel="help" href="https://w3c.github.io/webauthn/#iface-credential">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
 <script src=helpers.js></script>
 <body></body>
 <script>
diff --git a/tests/wpt/web-platform-tests/webauthn/createcredential-extensions.https.html b/tests/wpt/web-platform-tests/webauthn/createcredential-extensions.https.html
index f4a05c3042f..036200dbbf9 100644
--- a/tests/wpt/web-platform-tests/webauthn/createcredential-extensions.https.html
+++ b/tests/wpt/web-platform-tests/webauthn/createcredential-extensions.https.html
@@ -6,6 +6,8 @@
 <link rel="help" href="https://w3c.github.io/webauthn/#iface-credential">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
 <script src=helpers.js></script>
 <body></body>
 <script>
diff --git a/tests/wpt/web-platform-tests/webauthn/createcredential-passing.https.html b/tests/wpt/web-platform-tests/webauthn/createcredential-passing.https.html
index 92ef14912ba..ab10c7f519a 100644
--- a/tests/wpt/web-platform-tests/webauthn/createcredential-passing.https.html
+++ b/tests/wpt/web-platform-tests/webauthn/createcredential-passing.https.html
@@ -6,6 +6,8 @@
 <link rel="help" href="https://w3c.github.io/webauthn/#iface-credential">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
 <script src=helpers.js></script>
 <body></body>
 <script>
@@ -117,4 +119,4 @@ standardSetup(function() {
 
 /* JSHINT */
 /* globals standardSetup, CreateCredentialsTest, cose_alg_ECDSA_w_SHA256, cose_alg_ECDSA_w_SHA512, cloneObject */
-</script>
\ No newline at end of file
+</script>
diff --git a/tests/wpt/web-platform-tests/webauthn/createcredential-pubkeycredparams.https.html b/tests/wpt/web-platform-tests/webauthn/createcredential-pubkeycredparams.https.html
index 34622fdf74e..c845a906875 100644
--- a/tests/wpt/web-platform-tests/webauthn/createcredential-pubkeycredparams.https.html
+++ b/tests/wpt/web-platform-tests/webauthn/createcredential-pubkeycredparams.https.html
@@ -6,6 +6,8 @@
 <link rel="help" href="https://w3c.github.io/webauthn/#iface-credential">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
 <script src=helpers.js></script>
 <body></body>
 <script>
@@ -38,8 +40,12 @@ standardSetup(function() {
     new CreateCredentialsTest("options.publicKey.pubKeyCredParams", [badTypeEmptyString]).runTest("Bad pubKeyCredParams: first param has bad type (\"\")", TypeError);
     new CreateCredentialsTest("options.publicKey.pubKeyCredParams", [badTypeNull]).runTest("Bad pubKeyCredParams: first param has bad type (null)", TypeError);
     new CreateCredentialsTest("options.publicKey.pubKeyCredParams", [badTypeEmptyObj]).runTest("Bad pubKeyCredParams: first param has bad type (empty object)", TypeError);
-    new CreateCredentialsTest("options.publicKey.pubKeyCredParams", [badAlg]).runTest("Bad pubKeyCredParams: first param has bad alg (42)", "NotSupportedError");
-    new CreateCredentialsTest("options.publicKey.pubKeyCredParams", [badAlgZero]).runTest("Bad pubKeyCredParams: first param has bad alg (0)", "NotSupportedError");
+    new CreateCredentialsTest("options.publicKey.pubKeyCredParams", [badAlg])
+      .modify("options.publicKey.timeout", 300)
+      .runTest("Bad pubKeyCredParams: first param has bad alg (42)", "NotSupportedError");
+    new CreateCredentialsTest("options.publicKey.pubKeyCredParams", [badAlgZero])
+      .modify("options.publicKey.timeout", 300)
+      .runTest("Bad pubKeyCredParams: first param has bad alg (0)", "NotSupportedError");
 
     // TODO: come back to this when mock authenticators support multiple cryptos so that we can test the preference ranking
     // function verifyEC256(res) {
@@ -64,4 +70,4 @@ standardSetup(function() {
 
 /* JSHINT */
 /* globals standardSetup, CreateCredentialsTest, cose_alg_ECDSA_w_SHA512, cloneObject */
-</script>
\ No newline at end of file
+</script>
diff --git a/tests/wpt/web-platform-tests/webauthn/createcredential-timeout.https.html b/tests/wpt/web-platform-tests/webauthn/createcredential-timeout.https.html
index d4aa459240b..09af4520ae8 100644
--- a/tests/wpt/web-platform-tests/webauthn/createcredential-timeout.https.html
+++ b/tests/wpt/web-platform-tests/webauthn/createcredential-timeout.https.html
@@ -1,49 +1,52 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <title>WebAuthn navigator.credentials.create() timeout Tests</title>
+<meta name="timeout" content="long">
 <link rel="author" title="Adam Powers" href="mailto:adam@fidoalliance.org">
 <link rel="help" href="https://w3c.github.io/webauthn/#iface-credential">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
 <script src=helpers.js></script>
 <body></body>
 <script>
-standardSetup(function() {
-    "use strict";
+"use strict";
 
-    // bad timeout values
-    // TODO: there is some debate as to whether MAX_UNSIGNED_LONG + 1 and / or -1 should be disallowed since they get converted to valid values internally
-    // new CreateCredentialsTest({path: "options.publicKey.timeout", value: -1}).runTest("Bad timeout: negative", TypeError);
-    // new CreateCredentialsTest({path: "options.publicKey.timeout", value: 4294967295 + 1}).runTest("Bad timeout: too big", TypeError);
+// bad timeout values
+// TODO: there is some debate as to whether MAX_UNSIGNED_LONG + 1 and / or -1 should be disallowed since they get converted to valid values internally
+// new CreateCredentialsTest({path: "options.publicKey.timeout", value: -1}).runTest("Bad timeout: negative", TypeError);
+// new CreateCredentialsTest({path: "options.publicKey.timeout", value: 4294967295 + 1}).runTest("Bad timeout: too big", TypeError);
 
-    // timeout test
-    // XXX: this probably always passes with most mock authenticators unless
-    // some setup happens right here to make sure they don't return a credential
-    // right away. So... uhh... I guess test this with a real authenticator if you
-    // want to see if it really works.
-    promise_test(() => {
-        return new Promise((resolve, reject) => {
-            var args = {
-                options: {
-                    publicKey: {
-                        timeout: 1
-                    }
-                }
-            };
-
-            setTimeout(() => {
-                reject(new Error ("timed out"));
-            }, 1000);
-
-            createCredential(args).then((res) => {
-                resolve(res);
-            });
+// timeout test
+promise_test(async t => {
+    // if available, configure a mock authenticator that does not respond to user input
+    try {
+        await window.test_driver.add_virtual_authenticator({
+            protocol: "ctap1/u2f",
+            transport: "usb",
+            isUserConsenting: false,
         });
-    }, "ensure create credential times out");
-    // TODO: createCredential.timeout > 1s && setTimeout < 1s
-    // TODO: createCredential.timeout < 5s && setTimeout > 5s
-});
+    } catch (error) {
+        if (error !== "error: Action add_virtual_authenticator not implemented") {
+            throw error;
+        }
+    }
+
+    var args = {
+        options: {
+            publicKey: {
+                // browsers may set an arbitrary minimum timeout and not respect this value
+                timeout: 1
+            }
+        }
+    };
+
+    return promise_rejects_dom(t, "NotAllowedError", createCredential(args));
+}, "ensure create credential times out");
+// TODO: createCredential.timeout > 1s && setTimeout < 1s
+// TODO: createCredential.timeout < 5s && setTimeout > 5s
 
 /* JSHINT */
-/* globals standardSetup, CreateCredentialsTest, createCredential, promise_test */
-</script>
\ No newline at end of file
+/* globals standardSetup, CreateCredentialsTest, createCredential, promise_test, promise_rejects_dom*/
+</script>
diff --git a/tests/wpt/web-platform-tests/webauthn/getcredential-badargs-rpid.https.html b/tests/wpt/web-platform-tests/webauthn/getcredential-badargs-rpid.https.html
index 956b26fb9d9..6e0ef5f2018 100644
--- a/tests/wpt/web-platform-tests/webauthn/getcredential-badargs-rpid.https.html
+++ b/tests/wpt/web-platform-tests/webauthn/getcredential-badargs-rpid.https.html
@@ -6,6 +6,8 @@
 <link rel="help" href="https://w3c.github.io/webauthn/#iface-credential">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
 <script src=helpers.js></script>
 <body></body>
 <script>
@@ -33,4 +35,4 @@ standardSetup(function() {
 
 /* JSHINT */
 /* globals standardSetup, GetCredentialsTest, createCredential */
-</script>
\ No newline at end of file
+</script>
diff --git a/tests/wpt/web-platform-tests/webauthn/getcredential-badargs-userverification.https.html b/tests/wpt/web-platform-tests/webauthn/getcredential-badargs-userverification.https.html
index 5bc579bc333..7f8571586e4 100644
--- a/tests/wpt/web-platform-tests/webauthn/getcredential-badargs-userverification.https.html
+++ b/tests/wpt/web-platform-tests/webauthn/getcredential-badargs-userverification.https.html
@@ -6,6 +6,8 @@
 <link rel="help" href="https://w3c.github.io/webauthn/#iface-credential">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
 <script src=helpers.js></script>
 <body></body>
 <script>
@@ -27,7 +29,7 @@ standardSetup(function() {
     new GetCredentialsTest("options.publicKey.userVerification", null)
         .addCredential(credPromise)
         .runTest("Bad userVerification: null", TypeError);
-    // XXX: assumes this is a mock authenticator the properly reports that it is not doing userVerfication
+    // mock authenticator does not support user verification
     new GetCredentialsTest("options.publicKey.userVerification", "required")
         .addCredential(credPromise)
         .runTest("Bad userVerification: \"required\"", "NotAllowedError");
@@ -35,4 +37,4 @@ standardSetup(function() {
 
 /* JSHINT */
 /* globals standardSetup, GetCredentialsTest, createCredential */
-</script>
\ No newline at end of file
+</script>
diff --git a/tests/wpt/web-platform-tests/webauthn/getcredential-extensions.https.html b/tests/wpt/web-platform-tests/webauthn/getcredential-extensions.https.html
index 763f48b70f3..820f9b529f1 100644
--- a/tests/wpt/web-platform-tests/webauthn/getcredential-extensions.https.html
+++ b/tests/wpt/web-platform-tests/webauthn/getcredential-extensions.https.html
@@ -6,6 +6,8 @@
 <link rel="help" href="https://w3c.github.io/webauthn/#iface-credential">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
 <script src=helpers.js></script>
 <body></body>
 <script>
diff --git a/tests/wpt/web-platform-tests/webauthn/getcredential-passing.https.html b/tests/wpt/web-platform-tests/webauthn/getcredential-passing.https.html
index 86dd668d495..dae05e0993a 100644
--- a/tests/wpt/web-platform-tests/webauthn/getcredential-passing.https.html
+++ b/tests/wpt/web-platform-tests/webauthn/getcredential-passing.https.html
@@ -6,6 +6,8 @@
 <link rel="help" href="https://w3c.github.io/webauthn/#iface-credential">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
 <script src=helpers.js></script>
 <body></body>
 <script>
@@ -64,4 +66,4 @@ standardSetup(function() {
 
 /* JSHINT */
 /* globals standardSetup, GetCredentialsTest, createCredential */
-</script>
\ No newline at end of file
+</script>
diff --git a/tests/wpt/web-platform-tests/webauthn/getcredential-timeout.https.html b/tests/wpt/web-platform-tests/webauthn/getcredential-timeout.https.html
index e6cd884ae06..228ef509789 100644
--- a/tests/wpt/web-platform-tests/webauthn/getcredential-timeout.https.html
+++ b/tests/wpt/web-platform-tests/webauthn/getcredential-timeout.https.html
@@ -6,13 +6,41 @@
 <link rel="help" href="https://w3c.github.io/webauthn/#iface-credential">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
 <script src=helpers.js></script>
 <body></body>
 <script>
-standardSetup(function() {
+promise_test(async t => {
     "use strict";
 
-    var credPromise = createCredential();
+    let credentialId;
+    try {
+        // if available, set up a mock authenticator that does not respond to user input with a credential
+        let authenticator = await window.test_driver.add_virtual_authenticator({
+            protocol: "ctap1/u2f",
+            transport: "usb",
+            isUserConsenting: false,
+        });
+        const private_key =
+            "MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg8_zMDQDYAxlU-Q"
+          + "hk1Dwkf0v18GZca1DMF3SaJ9HPdmShRANCAASNYX5lyVCOZLzFZzrIKmeZ2jwU"
+          + "RmgsJYxGP__fWN_S-j5sN4tT15XEpN_7QZnt14YvI6uvAgO0uJEboFaZlOEB";
+        credentialId = new Uint8Array([..."cred-1"].map(c => c.charCodeAt(0)));
+        await window.test_driver.add_credential(authenticator, {
+            credentialId: btoa("cred-1"),
+            rpId: window.location.hostname,
+            privateKey: private_key,
+            signCount: 0,
+            isResidentCredential: false,
+        });
+    } catch (error) {
+        if (error !== "error: Action add_virtual_authenticator not implemented") {
+            throw error;
+        }
+      // configure a manual authenticator by creating a credential.
+      credentialId = (await createCredential()).rawId;
+    }
 
     // bad timeout values
     // TODO: there is some debate as to whether MAX_UNSIGNED_LONG + 1 and / or -1 should be disallowed since they get converted to valid values internally
@@ -24,28 +52,20 @@ standardSetup(function() {
     //     .runTest("Bad timeout: too big", TypeError);
 
     // timeout test
-    // XXX: this probably always passes with most mock authenticators unless
-    // some setup happens right here to make sure they don't return a credential
-    // right away. So... uhh... I guess test this with a real authenticator if you
-    // want to see if it really works.
-    var timer;
-    function startTimer() {
-        timer = setTimeout(() => {
-            throw new Error("Timer went off before timeout");
-        }, 1000);
-    }
-    function stopTimer() {
-        clearTimeout(timer);
-    }
-    new GetCredentialsTest({path: "options.publicKey.timeout", value: 1})
-        .addCredential(credPromise)
-        .beforeTest(startTimer)
-        .afterTest(stopTimer)
-        .runTest("ensure create credential times out");
+    return promise_rejects_dom(t, "NotAllowedError", navigator.credentials.get({
+        publicKey: {
+            challenge: new Uint8Array([1, 2, 3]),
+            allowCredentials: [{
+                id: credentialId,
+                type: "public-key",
+            }],
+            timeout: 1,
+        },
+    }));
     // TODO: createCredential.timeout > 1s && setTimeout < 1s
     // TODO: createCredential.timeout < 5s && setTimeout > 5s
 });
 
 /* JSHINT */
-/* globals standardSetup, GetCredentialsTest, createCredential */
-</script>
\ No newline at end of file
+/* globals standardSetup, GetCredentialsTest, createCredential, promise_rejects_dom */
+</script>
diff --git a/tests/wpt/web-platform-tests/webauthn/helpers.js b/tests/wpt/web-platform-tests/webauthn/helpers.js
index bbbba464948..bf28e69cccf 100644
--- a/tests/wpt/web-platform-tests/webauthn/helpers.js
+++ b/tests/wpt/web-platform-tests/webauthn/helpers.js
@@ -535,63 +535,21 @@ function validateAuthenticatorAssertionResponse(assert) {
     // TODO: parseAuthenticatorData() and make sure flags are correct
 }
 
-//************* BEGIN DELETE AFTER 1/1/2018 *************** //
-// XXX for development mode only!!
-// debug() for debugging purposes... we can drop this later if it is considered ugly
-// note that debug is currently an empty function (i.e. - prints no output)
-// and debug only prints output if the polyfill is loaded
-var debug = function() {};
-// if the WebAuthn API doesn't exist load a polyfill for testing
-// note that the polyfill only gets loaded if navigator.credentials create doesn't exist
-// AND if the polyfill script is found at the right path (i.e. - the polyfill is opt-in)
-function ensureInterface() {
-    if (typeof navigator.credentials === "object" && typeof navigator.credentials.create !== "function") {
-        // debug = onsole.log;
-
-        return loadJavaScript("/webauthn/webauthn-polyfill/webauthn-polyfill.js")
-            .then(() => {
-                return loadJavaScript("/webauthn/webauthn-soft-authn/soft-authn.js");
-            });
-    } else {
-        return Promise.resolve();
-    }
-}
-
-function loadJavaScript(path) {
-    return new Promise((resolve, reject) => {
-        // dynamic loading of polyfill script by creating new <script> tag and seeing the src=
-        var scriptElem = document.createElement("script");
-        if (typeof scriptElem !== "object") {
-            debug("ensureInterface: Error creating script element while attempting loading polyfill");
-            return reject(new Error("ensureInterface: Error creating script element while loading polyfill"));
-        }
-        scriptElem.type = "application/javascript";
-        scriptElem.onload = function() {
-            debug("!!! Loaded " + path + " ...");
-            return resolve();
-        };
-        scriptElem.onerror = function() {
-            debug("navigator.credentials.create does not exist");
-            resolve();
-        };
-        scriptElem.src = path;
-        if (document.body) {
-            document.body.appendChild(scriptElem);
-        } else {
-            debug("ensureInterface: DOM has no body");
-            return reject(new Error("ensureInterface: DOM has no body"));
+function standardSetup(cb) {
+    // Setup an automated testing environment if available.
+    window.test_driver.add_virtual_authenticator({
+      protocol: "ctap1/u2f",
+      transport: "usb"
+    }).then(cb).catch(error => {
+        if (error === "error: Action add_virtual_authenticator not implemented") {
+          // The protocol is not available. Continue manually.
+          cb();
+          return;
         }
+        throw error;
     });
 }
 
-function standardSetup(cb) {
-    return ensureInterface()
-        .then(() => {
-            if (cb) return cb();
-        });
-}
-//************* END DELETE AFTER 1/1/2018 *************** //
-
 /* JSHINT */
 /* globals promise_rejects_dom, promise_rejects_js, assert_class_string, assert_equals, assert_idl_attribute, assert_readonly, promise_test */
 /* exported standardSetup, CreateCredentialsTest, GetCredentialsTest */
diff --git a/tests/wpt/web-platform-tests/webauthn/securecontext.http.html b/tests/wpt/web-platform-tests/webauthn/securecontext.http.html
index 52786950f38..27d2dbfce3e 100644
--- a/tests/wpt/web-platform-tests/webauthn/securecontext.http.html
+++ b/tests/wpt/web-platform-tests/webauthn/securecontext.http.html
@@ -8,41 +8,39 @@
 <script src=helpers.js></script>
 <body></body>
 <script>
-standardSetup(function() {
-    "use strict";
+"use strict";
 
-    // See https://www.w3.org/TR/secure-contexts/
-    // Section 1.1 - 1.4 for list of examples referenced below
+// See https://www.w3.org/TR/secure-contexts/
+// Section 1.1 - 1.4 for list of examples referenced below
 
-    // Example 1
-    // http://example.com/ opened in a top-level browsing context is not a secure context, as it was not delivered over an authenticated and encrypted channel.
-    test (() => {
-        assert_false (typeof navigator.credentials === "object" && typeof navigator.credentials.create === "function");
-    }, "no navigator.credentials.create in non-secure context");
+// Example 1
+// http://example.com/ opened in a top-level browsing context is not a secure context, as it was not delivered over an authenticated and encrypted channel.
+test (() => {
+    assert_false (typeof navigator.credentials === "object" && typeof navigator.credentials.create === "function");
+}, "no navigator.credentials.create in non-secure context");
 
-    // Example 4: TODO
-    // If a non-secure context opens https://example.com/ in a new window, then things are more complicated. The new window’s status depends on how it was opened. If the non-secure context can obtain a reference to the secure context, or vice-versa, then the new window is not a secure context.
-    //
-    // This means that the following will both produce non-secure contexts:
-    //<a href="https://example.com/" target="_blank">Link!</a>
-    // <script>
-    //     var w = window.open("https://example.com/");
-    // < /script>
+// Example 4: TODO
+// If a non-secure context opens https://example.com/ in a new window, then things are more complicated. The new window’s status depends on how it was opened. If the non-secure context can obtain a reference to the secure context, or vice-versa, then the new window is not a secure context.
+//
+// This means that the following will both produce non-secure contexts:
+//<a href="https://example.com/" target="_blank">Link!</a>
+// <script>
+//     var w = window.open("https://example.com/");
+// < /script>
 
-    // Example 6: TODO
-    // If https://example.com/ was somehow able to frame http://non-secure.example.com/ (perhaps the user has overridden mixed content checking?), the top-level frame would remain secure, but the framed content is not a secure context.
+// Example 6: TODO
+// If https://example.com/ was somehow able to frame http://non-secure.example.com/ (perhaps the user has overridden mixed content checking?), the top-level frame would remain secure, but the framed content is not a secure context.
 
-    // Example 7: TODO
-    // If, on the other hand, https://example.com/ is framed inside of http://non-secure.example.com/, then it is not a secure context, as its ancestor is not delivered over an authenticated and encrypted channel.
+// Example 7: TODO
+// If, on the other hand, https://example.com/ is framed inside of http://non-secure.example.com/, then it is not a secure context, as its ancestor is not delivered over an authenticated and encrypted channel.
 
-    // Example 9: TODO
-    // If http://non-secure.example.com/ in a top-level browsing context frames https://example.com/, which runs https://example.com/worker.js, then neither the framed document nor the worker are secure contexts.
+// Example 9: TODO
+// If http://non-secure.example.com/ in a top-level browsing context frames https://example.com/, which runs https://example.com/worker.js, then neither the framed document nor the worker are secure contexts.
 
-    // Example 12: TODO
-    // https://example.com/ nested in http://non-secure.example.com/ may not connect to the secure worker, as it is not a secure context.
+// Example 12: TODO
+// https://example.com/ nested in http://non-secure.example.com/ may not connect to the secure worker, as it is not a secure context.
 
-    // Example 13: TODO
-    // Likewise, if https://example.com/ nested in http://non-secure.example.com/ runs https://example.com/worker.js as a Shared Worker, then both the document and the worker are considered non-secure.
+// Example 13: TODO
+// Likewise, if https://example.com/ nested in http://non-secure.example.com/ runs https://example.com/worker.js as a Shared Worker, then both the document and the worker are considered non-secure.
 
-});
-</script>
\ No newline at end of file
+</script>
diff --git a/tests/wpt/web-platform-tests/webauthn/securecontext.https.html b/tests/wpt/web-platform-tests/webauthn/securecontext.https.html
index 6c9aabd11ea..f9270047024 100644
--- a/tests/wpt/web-platform-tests/webauthn/securecontext.https.html
+++ b/tests/wpt/web-platform-tests/webauthn/securecontext.https.html
@@ -8,23 +8,21 @@
 <script src=helpers.js></script>
 <body></body>
 <script>
-standardSetup(function() {
-    "use strict";
+"use strict";
 
-    // See https://www.w3.org/TR/secure-contexts/
-    // Section 1.1 - 1.4 for list of examples referenced below
+// See https://www.w3.org/TR/secure-contexts/
+// Section 1.1 - 1.4 for list of examples referenced below
 
-    // Example 2
-    // https://example.com/ opened in a top-level browsing context is a secure context, as it was delivered over an authenticated and encrypted channel.
-    test (() => {
-        assert_true (typeof navigator.credentials === "object" && typeof navigator.credentials.create === "function");
-    }, "navigator.credentials.create exists in secure context");
+// Example 2
+// https://example.com/ opened in a top-level browsing context is a secure context, as it was delivered over an authenticated and encrypted channel.
+test (() => {
+    assert_true (typeof navigator.credentials === "object" && typeof navigator.credentials.create === "function");
+}, "navigator.credentials.create exists in secure context");
 
-    // Example 3: TODO
-    // Example 5: TODO
-    // Example 8: TODO
-    // Example 10: TODO
-    // Example 11: TODO
+// Example 3: TODO
+// Example 5: TODO
+// Example 8: TODO
+// Example 10: TODO
+// Example 11: TODO
 
-});
-</script>
\ No newline at end of file
+</script>
diff --git a/tests/wpt/web-platform-tests/webmessaging/broadcastchannel/basics.html b/tests/wpt/web-platform-tests/webmessaging/broadcastchannel/basics.html
index 3d8ba76fb1b..ed16e32f543 100644
--- a/tests/wpt/web-platform-tests/webmessaging/broadcastchannel/basics.html
+++ b/tests/wpt/web-platform-tests/webmessaging/broadcastchannel/basics.html
@@ -69,17 +69,6 @@ async_test(t => {
     c1.postMessage('test');
   }, 'messages aren\'t delivered to a closed port');
 
- async_test(t => {
-    let c1 = new BroadcastChannel('closed');
-    let c2 = new BroadcastChannel('closed');
-    let c3 = new BroadcastChannel('closed');
-
-    c2.onmessage = t.unreached_func();
-    c3.onmessage = t.step_func(() => t.done());
-    c1.postMessage('test');
-    c2.close();
-}, 'messages aren\'t delivered to a port closed after calling postMessage.');
-
 async_test(t => {
     let c1 = new BroadcastChannel('create-in-onmessage');
     let c2 = new BroadcastChannel('create-in-onmessage');
@@ -98,6 +87,8 @@ async_test(t => {
     c2.postMessage('second');
   }, 'closing and creating channels during message delivery works correctly');
 
+// TODO(mek): Depending on https://github.com/whatwg/html/issues/1371 adjust
+// this test to match the correct behavior.
 async_test(t => {
     let c1 = new BroadcastChannel('close-in-onmessage');
     let c2 = new BroadcastChannel('close-in-onmessage');
@@ -117,12 +108,13 @@ async_test(t => {
           assert_array_equals(events, [
               'c2: first',
               'c3: first',
+              'c2: done',
               'c3: done']);
           t.done();
         }
       }));
     c1.postMessage('first');
     c1.postMessage('done');
-  }, 'Closing a channel in onmessage prevents already queued tasks from firing onmessage events');
+  }, 'Closing a channel in onmessage doesn\'t cancel already queued events');
 
 </script>
diff --git a/tests/wpt/web-platform-tests/webmessaging/postMessage_Document.htm b/tests/wpt/web-platform-tests/webmessaging/postMessage_Document.htm
index a5580ef4b2b..c00a09a8658 100644
--- a/tests/wpt/web-platform-tests/webmessaging/postMessage_Document.htm
+++ b/tests/wpt/web-platform-tests/webmessaging/postMessage_Document.htm
@@ -25,7 +25,7 @@
     {
         test(function()
         {
-            assert_throws_dom("DATA_CLONE_ERR", function()
+            assert_throws_dom("DATA_CLONE_ERR", TARGET.contentWindow.DOMException, function()
             {
                 TARGET.contentWindow.postMessage(DATA, "*");
             });
diff --git a/tests/wpt/web-platform-tests/webmessaging/postMessage_Function.htm b/tests/wpt/web-platform-tests/webmessaging/postMessage_Function.htm
index fd31f83df4b..3976cebb747 100644
--- a/tests/wpt/web-platform-tests/webmessaging/postMessage_Function.htm
+++ b/tests/wpt/web-platform-tests/webmessaging/postMessage_Function.htm
@@ -25,7 +25,7 @@
     {
         test(function()
         {
-            assert_throws_dom("DATA_CLONE_ERR", function()
+            assert_throws_dom("DATA_CLONE_ERR", TARGET.contentWindow.DOMException, function()
             {
                 TARGET.contentWindow.postMessage(DATA, "*");
             });
diff --git a/tests/wpt/web-platform-tests/webmessaging/postMessage_dup_transfer_objects.htm b/tests/wpt/web-platform-tests/webmessaging/postMessage_dup_transfer_objects.htm
index 511b51271f3..ade9515d3ac 100644
--- a/tests/wpt/web-platform-tests/webmessaging/postMessage_dup_transfer_objects.htm
+++ b/tests/wpt/web-platform-tests/webmessaging/postMessage_dup_transfer_objects.htm
@@ -25,7 +25,7 @@
     {
         test(function()
         {
-            assert_throws_dom("DATA_CLONE_ERR", function()
+            assert_throws_dom("DATA_CLONE_ERR", TARGET.contentWindow.DOMException, function()
             {
                 assert_own_property(window, "MessageChannel", "window");
                 var channel = new MessageChannel();
diff --git a/tests/wpt/web-platform-tests/webmessaging/postMessage_invalid_targetOrigin.htm b/tests/wpt/web-platform-tests/webmessaging/postMessage_invalid_targetOrigin.htm
index b9cc6377ef8..e2b39df22df 100644
--- a/tests/wpt/web-platform-tests/webmessaging/postMessage_invalid_targetOrigin.htm
+++ b/tests/wpt/web-platform-tests/webmessaging/postMessage_invalid_targetOrigin.htm
@@ -27,7 +27,7 @@
     {
         test(function()
         {
-            assert_throws_dom("SYNTAX_ERR", function()
+            assert_throws_dom("SYNTAX_ERR", TARGET.contentWindow.DOMException, function()
             {
                 TARGET.contentWindow.postMessage(DATA, DATA);
             });
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-onnegotiationneeded.html b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-onnegotiationneeded.html
index 3e31c327ac2..3b65faca927 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-onnegotiationneeded.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-onnegotiationneeded.html
@@ -348,6 +348,28 @@
     await new Promise(resolve => pc.onnegotiationneeded = resolve);
   }, 'Calling setStreams should cause negotiationneeded to fire');
 
+  promise_test(async t => {
+    const pc1 = new RTCPeerConnection();
+    t.add_cleanup(() => pc1.close());
+    const pc2 = new RTCPeerConnection();
+    t.add_cleanup(() => pc2.close());
+
+    let negotiationCount = 0;
+    pc1.onnegotiationneeded = async () => {
+      negotiationCount++;
+      await pc1.setLocalDescription(await pc1.createOffer());
+      await pc2.setRemoteDescription(pc1.localDescription);
+      await pc2.setLocalDescription(await pc2.createAnswer());
+      await pc1.setRemoteDescription(pc2.localDescription);
+    }
+
+    pc1.addTransceiver("video");
+    await new Promise(r => pc1.onsignalingstatechange = () => pc1.signalingState == "stable" && r());
+    pc1.addTransceiver("audio");
+    await new Promise(r => pc1.onsignalingstatechange = () => pc1.signalingState == "stable" && r());
+    assert_equals(negotiationCount, 2);
+  }, 'Adding two transceivers, one at a time, results in the expected number of negotiationneeded events');
+
   /*
     TODO
     4.7.3.  Updating the Negotiation-Needed flag
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-rollback.html b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-rollback.html
index 66067dae696..516cb57025b 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-rollback.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-rollback.html
@@ -551,4 +551,19 @@
     pc1.removeTrack(transceiver.sender);
   }, 'removeTrack() with a sender being rolled back does not crash or throw');
 
+  promise_test(async t => {
+    const pc1 = new RTCPeerConnection();
+    t.add_cleanup(() => pc1.close());
+    const pc2 = new RTCPeerConnection();
+    t.add_cleanup(() => pc2.close());
+    pc1.addTransceiver('video');
+    const channel = pc2.createDataChannel('dummy');
+    await pc2.setLocalDescription(await pc2.createOffer());
+    await pc2.setRemoteDescription(await pc1.createOffer());
+    assert_equals(pc2.signalingState, 'have-remote-offer');
+    await pc2.setLocalDescription(await pc2.createAnswer());
+    await pc2.setLocalDescription(await pc2.createOffer());
+    assert_equals(channel.readyState, 'connecting');
+  }, 'Implicit rollback with only a datachannel works');
+
 </script>
diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/ice-ufragpwd.html b/tests/wpt/web-platform-tests/webrtc/protocol/ice-ufragpwd.html
new file mode 100644
index 00000000000..bd151284cbb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webrtc/protocol/ice-ufragpwd.html
@@ -0,0 +1,55 @@
+<!doctype html>
+<meta charset=utf-8>
+<meta name="timeout" content="long">
+<title>RTCPeerConnection Failed State</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../RTCPeerConnection-helper.js"></script>
+<script>
+'use strict';
+
+// Tests for validating ice-ufrag and ice-pwd syntax defined in
+// https://tools.ietf.org/html/rfc5245#section-15.4
+// Alphanumeric, '+' and '/' are allowed.
+
+const preamble = `v=0
+o=- 0 3 IN IP4 127.0.0.1
+s=-
+t=0 0
+a=fingerprint:sha-256 A7:24:72:CA:6E:02:55:39:BA:66:DF:6E:CC:4C:D8:B0:1A:BF:1A:56:65:7D:F4:03:AD:7E:77:43:2A:29:EC:93
+m=video 1 RTP/SAVPF 100
+c=IN IP4 0.0.0.0
+a=rtcp-mux
+a=sendonly
+a=mid:video
+a=rtpmap:100 VP8/30
+a=setup:actpass
+`;
+const valid_ufrag = 'a=ice-ufrag:ETEn\r\n';
+const valid_pwd = 'a=ice-pwd:OtSK0WpNtpUjkY4+86js7Z/l\r\n';
+const not_ice_char = '$'; // A snowman emoji would be cool but is not interoperable.
+
+promise_test(async t => {
+  const pc = new RTCPeerConnection();
+  t.add_cleanup(() => pc.close());
+
+  const sdp = preamble +
+    valid_ufrag.replace('ETEn', 'E' + not_ice_char + 'En') +
+    valid_pwd;
+
+  return promise_rejects_dom(t, 'InvalidAccessError',
+    pc.setRemoteDescription({type: 'offer', sdp}));
+}, 'setRemoteDescription with a ice-ufrag containing a non-ice-char fails');
+
+promise_test(async t => {
+  const pc = new RTCPeerConnection();
+  t.add_cleanup(() => pc.close());
+
+  const sdp = preamble +
+    valid_ufrag +
+    valid_pwd.replace('K0Wp', 'K' + not_ice_char + 'Wp');
+
+  return promise_rejects_dom(t, 'InvalidAccessError',
+    pc.setRemoteDescription({type: 'offer', sdp}));
+}, 'setRemoteDescription with a ice-pwd containing a non-ice-char fails');
+</script>
diff --git a/tests/wpt/web-platform-tests/websockets/handlers/simple_handshake_wsh.py b/tests/wpt/web-platform-tests/websockets/handlers/simple_handshake_wsh.py
index bd9bb9c45f5..a612a1a833d 100755
--- a/tests/wpt/web-platform-tests/websockets/handlers/simple_handshake_wsh.py
+++ b/tests/wpt/web-platform-tests/websockets/handlers/simple_handshake_wsh.py
@@ -13,7 +13,7 @@ def web_socket_do_extra_handshake(request):
            b'Set-Cookie: ws_test=test\x0D\x0A'
            b'Sec-WebSocket-Origin: %s\x0D\x0A'
            b'Sec-WebSocket-Accept: %s\x0D\x0A\x0D\x0A') % (request.ws_origin.encode(
-               'UTF-8'), hybi.compute_accept(request.headers_in.get(common.SEC_WEBSOCKET_KEY_HEADER).encode('UTF-8'))[0])
+               'UTF-8'), hybi.compute_accept_from_unicode(request.headers_in.get(common.SEC_WEBSOCKET_KEY_HEADER)))
     request.connection.write(msg)
     # Send a clean close frame.
     body = stream.create_closing_handshake_body(1000, '')
diff --git a/tests/wpt/web-platform-tests/webxr/dom-overlay/ar_dom_overlay.https.html b/tests/wpt/web-platform-tests/webxr/dom-overlay/ar_dom_overlay.https.html
index d63197c46a5..15eac78d928 100644
--- a/tests/wpt/web-platform-tests/webxr/dom-overlay/ar_dom_overlay.https.html
+++ b/tests/wpt/web-platform-tests/webxr/dom-overlay/ar_dom_overlay.https.html
@@ -11,13 +11,22 @@
       min-width: 10px;
       min-height: 10px;
   }
+  iframe {
+    border: 0;
+    width: 20px;
+    height: 20px;
+  }
 </style>
 <div id="div_overlay">
   <div id="inner_a">
   </div>
   <div id="inner_b">
   </div>
-  <canvas />
+  <!-- This SVG iframe is treated as cross-origin content. -->
+  <iframe id="iframe" src='data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><rect height="20" width="20" fill="red" fill-opacity="0.3"/></svg>'>
+  </iframe>
+  <canvas>
+  </canvas>
 </div>
 <div id="div_other">
   <p>test text</p>
@@ -32,44 +41,95 @@ const fakeDeviceInitParams = {
   supportedFeatures: ALL_FEATURES,
 };
 
-let watcherStep = new Event("watcherstep");
-let watcherDone = new Event("watcherdone");
-
-let testFunction = function(overlayElement, session, fakeDeviceController, t) {
+let testBasicProperties = function(overlayElement, session, fakeDeviceController, t) {
   assert_equals(session.mode, 'immersive-ar');
   assert_not_equals(session.environmentBlendMode, 'opaque');
 
   assert_true(overlayElement != null);
   assert_true(overlayElement instanceof Element);
 
-  assert_equals(session.domOverlayState.type, "screen");
+  // Verify that the DOM overlay type is one of the known types.
+  assert_in_array(session.domOverlayState.type,
+                  ["screen", "floating", "head-locked"]);
 
   // Verify SameObject property for domOverlayState
   assert_true(session.domOverlayState === session.domOverlayState);
 
-  // add: "select", "no_event",
-  let eventWatcher = new EventWatcher(
-    t, session, ["watcherstep", "select", "watcherdone"]);
-  let eventPromise = eventWatcher.wait_for(
-    ["watcherstep", "select", "watcherdone"]);
+  // The overlay element should have a transparent background.
+  assert_equals(window.getComputedStyle(overlayElement).backgroundColor,
+                'rgba(0, 0, 0, 0)');
+
+  // Check that the pseudostyle is set.
+  assert_equals(document.querySelector(':xr-overlay'), overlayElement);
+
+  return new Promise((resolve) => {
+    session.requestAnimationFrame((time, xrFrame) => {
+      resolve();
+    });
+  });
+};
+
+let testFullscreen = function(overlayElement, session, fakeDeviceController, t) {
+  // If the browser implements DOM Overlay using Fullscreen API,
+  // it must not be possible to change the DOM Overlay element by using
+  // Fullscreen API, and attempts to do so must be rejected.
+  // Since this is up to the UA, this test also passes if the fullscreen
+  // element is different from the overlay element.
+
+  let rafPromise = new Promise((resolve) => {
+    session.requestAnimationFrame((time, xrFrame) => {
+      resolve();
+    });
+  });
+  let promises = [rafPromise];
+
+  if (document.fullscreenElement == overlayElement) {
+    let elem = document.getElementById('div_other');
+    assert_true(elem != null);
+    assert_not_equals(elem, overlayElement);
+
+    let fullscreenPromise = new Promise((resolve, reject) => {
+      elem.requestFullscreen().then(() => {
+        assert_unreached("fullscreen change should be blocked");
+        reject();
+      }).catch(() => {
+        resolve();
+      });
+    });
+    promises.push(fullscreenPromise);
+  }
+
+  return Promise.all(promises);
+};
+
+let watcherStep = new Event("watcherstep");
+let watcherDone = new Event("watcherdone");
+
+let testInput = function(overlayElement, session, fakeDeviceController, t) {
+
+  // Use two DIVs for this test. "inner_a" uses a "beforexrselect" handler
+  // that uses preventDefault(). Controller interactions with it should trigger
+  // that event, and not generate an XR select event.
 
   let inner_a = document.getElementById('inner_a');
   assert_true(inner_a != null);
   let inner_b = document.getElementById('inner_b');
   assert_true(inner_b != null);
 
+  let got_beforexrselect = false;
   inner_a.addEventListener('beforexrselect', (ev) => {
     ev.preventDefault();
+    got_beforexrselect = true;
   });
 
-  // The overlay element should have a transparent background.
-  assert_equals(window.getComputedStyle(overlayElement).backgroundColor,
-                'rgba(0, 0, 0, 0)');
+  let eventWatcher = new EventWatcher(
+    t, session, ["watcherstep", "select", "watcherdone"]);
 
-  // Try fullscreening a different element, this should fail.
-  let elem = document.getElementById('div_other');
-  assert_true(elem != null);
-  assert_not_equals(elem, overlayElement);
+  // Set up the expected sequence of events. The test triggers two select
+  // actions, but only the second one should generate a "select" event.
+  // Use a "watcherstep" in between to verify this.
+  let eventPromise = eventWatcher.wait_for(
+    ["watcherstep", "select", "watcherdone"]);
 
   let input_source =
       fakeDeviceController.simulateInputSourceConnection(SCREEN_CONTROLLER);
@@ -80,6 +140,62 @@ let testFunction = function(overlayElement, session, fakeDeviceController, t) {
                                              inner_a.offsetTop + 1);
       input_source.startSelection();
 
+      session.requestAnimationFrame((time, xrFrame) => {
+        input_source.endSelection();
+
+        session.requestAnimationFrame((time, xrFrame) => {
+          // Need to process one more frame to allow select to propagate.
+          session.requestAnimationFrame((time, xrFrame) => {
+            session.dispatchEvent(watcherStep);
+
+            assert_true(got_beforexrselect);
+
+            session.requestAnimationFrame((time, xrFrame) => {
+              input_source.setOverlayPointerPosition(inner_b.offsetLeft + 1,
+                                                     inner_b.offsetTop + 1);
+              input_source.startSelection();
+
+              session.requestAnimationFrame((time, xrFrame) => {
+                input_source.endSelection();
+
+                session.requestAnimationFrame((time, xrFrame) => {
+                  // Need to process one more frame to allow select to propagate.
+                  session.dispatchEvent(watcherDone);
+                });
+              });
+            });
+          });
+        });
+      });
+    });
+  });
+  return eventPromise;
+};
+
+let testCrossOriginContent = function(overlayElement, session, fakeDeviceController, t) {
+  let iframe = document.getElementById('iframe');
+  assert_true(iframe != null);
+  let inner_b = document.getElementById('inner_b');
+  assert_true(inner_b != null);
+
+  let eventWatcher = new EventWatcher(
+    t, session, ["watcherstep", "select", "watcherdone"]);
+
+  // Set up the expected sequence of events. The test triggers two select
+  // actions, but only the second one should generate a "select" event.
+  // Use a "watcherstep" in between to verify this.
+  let eventPromise = eventWatcher.wait_for(
+    ["watcherstep", "select", "watcherdone"]);
+
+  let input_source =
+      fakeDeviceController.simulateInputSourceConnection(SCREEN_CONTROLLER);
+  session.requestReferenceSpace('viewer').then(function(viewerSpace) {
+    // Press the primary input button and then release it a short time later.
+    session.requestAnimationFrame((time, xrFrame) => {
+      input_source.setOverlayPointerPosition(iframe.offsetLeft + 1,
+                                             iframe.offsetTop + 1);
+      input_source.startSelection();
+
       session.requestAnimationFrame((time, xrFrame) => {
         input_source.endSelection();
 
@@ -110,16 +226,58 @@ let testFunction = function(overlayElement, session, fakeDeviceController, t) {
   return eventPromise;
 };
 
+xr_promise_test(
+"Ensures DOM Overlay rejected without root element",
+(t) => {
+  return navigator.xr.test.simulateDeviceConnection(fakeDeviceInitParams)
+  .then(() => {
+    return new Promise((resolve, reject) => {
+      navigator.xr.test.simulateUserActivation(() => {
+        resolve(
+          promise_rejects_dom(t, "NotSupportedError",
+            navigator.xr.requestSession('immersive-ar',
+              {requiredFeatures: ['dom-overlay']})
+            .then(session => session.end()),
+            "Should reject when not specifying DOM overlay root")
+        );
+      });
+    });
+  });
+});
+
 xr_session_promise_test(
-  "Ensures DOM Overlay feature works for immersive-ar",
-  testFunction.bind(this, document.body),
+  "Ensures DOM Overlay feature works for immersive-ar, body element",
+  testBasicProperties.bind(this, document.body),
   fakeDeviceInitParams, 'immersive-ar',
     {requiredFeatures: ['dom-overlay'],
      domOverlay: { root: document.body } });
 
 xr_session_promise_test(
-  "Ensures DOM Overlay element selection works",
-  testFunction.bind(this, document.getElementById('div_overlay')),
+  "Ensures DOM Overlay feature works for immersive-ar, div element",
+  testBasicProperties.bind(this, document.getElementById('div_overlay')),
+  fakeDeviceInitParams, 'immersive-ar',
+    {requiredFeatures: ['dom-overlay'],
+     domOverlay: { root: document.getElementById('div_overlay') } });
+
+xr_session_promise_test(
+  "Ensures DOM Overlay input deduplication works",
+  testInput.bind(this, document.getElementById('div_overlay')),
+  fakeDeviceInitParams, 'immersive-ar', {
+    requiredFeatures: ['dom-overlay'],
+    domOverlay: { root: document.getElementById('div_overlay') }
+  });
+
+xr_session_promise_test(
+  "Ensures DOM Overlay Fullscreen API doesn't change DOM overlay",
+  testFullscreen.bind(this, document.getElementById('div_overlay')),
+  fakeDeviceInitParams, 'immersive-ar', {
+    requiredFeatures: ['dom-overlay'],
+    domOverlay: { root: document.getElementById('div_overlay') }
+  });
+
+xr_session_promise_test(
+  "Ensures DOM Overlay interactions on cross origin iframe are ignored",
+  testCrossOriginContent.bind(this, document.getElementById('div_overlay')),
   fakeDeviceInitParams, 'immersive-ar', {
     requiredFeatures: ['dom-overlay'],
     domOverlay: { root: document.getElementById('div_overlay') }
diff --git a/tests/wpt/web-platform-tests/webxr/events_session_squeeze.https.html b/tests/wpt/web-platform-tests/webxr/events_session_squeeze.https.html
new file mode 100644
index 00000000000..59e4e3f72c5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webxr/events_session_squeeze.https.html
@@ -0,0 +1,137 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/webxr_util.js"></script>
+<script src="resources/webxr_test_constants.js"></script>
+<canvas id="webgl-canvas"></canvas>
+
+<script>
+let testName = "XRInputSources primary input presses properly fires off the "
+  + "right events";
+
+let watcherDone = new Event("watcherdone");
+
+let fakeDeviceInitParams = TRACKED_IMMERSIVE_DEVICE;
+
+let xrViewerSpace = null;
+
+let testFunction = function(session, fakeDeviceController, t) {
+  let eventWatcher = new EventWatcher(
+    t, session, ["squeezestart", "squeeze", "squeezeend", "watcherdone"]);
+  let eventPromise = eventWatcher.wait_for(
+    ["squeezestart", "squeeze", "squeezeend", "watcherdone"]);
+
+  function tryCallingFrameMethods(frame) {
+    t.step(() => {
+      // Frame is active but not an animation frame, so calling getPose is
+      // allowed while getViewerPose is not.
+      assert_throws_dom('InvalidStateError', () => frame.getViewerPose(currentReferenceSpace));
+      let pose = frame.getPose(xrViewerSpace, currentReferenceSpace);
+      assert_not_equals(pose, null);
+      assert_true(pose instanceof XRPose);
+      assert_false(pose instanceof XRViewerPose);
+    });
+  }
+
+  function onSessionSqueezeStart(event) {
+    t.step( () => {
+      let input_sources = session.inputSources;
+      assert_equals(event.frame.session, session);
+      assert_equals(event.inputSource, input_sources[0]);
+      validateSameObject(event);
+      tryCallingFrameMethods(event.frame);
+    });
+  }
+
+  function onSessionSqueezeEnd(event) {
+    t.step( () => {
+      let input_sources = session.inputSources;
+      assert_equals(event.frame.session, session);
+      assert_equals(event.inputSource, input_sources[0]);
+      validateSameObject(event);
+      tryCallingFrameMethods(event.frame);
+    });
+    session.dispatchEvent(watcherDone);
+  }
+
+  function onSessionSqueeze(event) {
+    t.step( () => {
+      let input_sources = session.inputSources;
+      assert_equals(event.frame.session, session);
+      assert_equals(event.inputSource, input_sources[0]);
+      validateSameObject(event);
+      tryCallingFrameMethods(event.frame);
+    });
+  }
+
+  // Verifies that the same object is returned each time attributes are accessed
+  // on an XRInputSoruceEvent, as required by the spec.
+  function validateSameObject(event) {
+    let frame = event.frame;
+    let source = event.inputSource;
+    t.step(() => {
+      assert_equals(frame, event.frame,
+        "XRInputSourceEvent.frame returns the same object.");
+      assert_equals(source, event.inputSource,
+        "XRInputSourceEvent.inputSource returns the same object.");
+    });
+  }
+
+  session.addEventListener("squeezestart", onSessionSqueezeStart, false);
+  session.addEventListener("squeezeend", onSessionSqueezeEnd, false);
+  session.addEventListener("squeeze", onSessionSqueeze, false);
+
+  let pressed_grip_button = {
+    buttonType: "grip",
+    pressed: true,
+    touched: true,
+    pressedValue: 1.0
+  };
+
+  let unpressed_grip_button = {
+    buttonType: "grip",
+    pressed: false,
+    touched: false,
+    pressedValue: 0.0
+  };
+
+  let gripController = {
+      handedness: "none",
+      targetRayMode: "tracked-pointer",
+      pointerOrigin: VALID_POINTER_TRANSFORM,
+      profiles: [],
+      supportedButtons: [ unpressed_grip_button ]
+  };
+
+  let input_source =
+    fakeDeviceController.simulateInputSourceConnection(gripController);
+  let currentReferenceSpace = null;
+
+  session.requestReferenceSpace('viewer').then(function(viewerSpace) {
+    xrViewerSpace = viewerSpace;
+
+    session.requestReferenceSpace('local').then((referenceSpace) => {
+      currentReferenceSpace = referenceSpace;
+
+      //Simulate a grip starting then release it a short time later.
+      session.requestAnimationFrame((time, xrFrame) => {
+        input_source.updateButtonState(pressed_grip_button);
+
+          session.requestAnimationFrame((time, xrFrame) => {
+            input_source.updateButtonState(unpressed_grip_button);
+
+            session.requestAnimationFrame((time, xrFrame) => {
+              // Need to process one more frame to allow grip to propegate.
+            });
+          });
+      });
+    });
+  });
+
+  return eventPromise;
+};
+
+xr_session_promise_test(
+  testName, testFunction, fakeDeviceInitParams, 'immersive-vr');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/workers/Worker-constructor-proto.any.js b/tests/wpt/web-platform-tests/workers/Worker-constructor-proto.any.js
index 90ad767b980..f0544b6c15a 100644
--- a/tests/wpt/web-platform-tests/workers/Worker-constructor-proto.any.js
+++ b/tests/wpt/web-platform-tests/workers/Worker-constructor-proto.any.js
@@ -1,7 +1,7 @@
 //META: global=!default, worker
 test(() => {
-  proto = new Number(42)
+  const proto = {};
   assert_equals(String(Object.getPrototypeOf(WorkerLocation)).replace(/\n/g, " ").replace(/\s\s+/g, " "), "function () { [native code] }");
   WorkerLocation.__proto__ = proto;
-  assert_object_equals(Object.getPrototypeOf(WorkerLocation), Object(42));
+  assert_equals(Object.getPrototypeOf(WorkerLocation), proto);
 }, 'Tests that setting the proto of a built in constructor is not reset.');
diff --git a/tests/wpt/web-platform-tests/xhr/open-url-multi-window-2.htm b/tests/wpt/web-platform-tests/xhr/open-url-multi-window-2.htm
index fdd91016db8..64cc96b61b2 100644
--- a/tests/wpt/web-platform-tests/xhr/open-url-multi-window-2.htm
+++ b/tests/wpt/web-platform-tests/xhr/open-url-multi-window-2.htm
@@ -11,12 +11,13 @@
     <script>
     function init(){ // called from page inside IFRAME
         test(function() {
-          var client = new self[0].XMLHttpRequest()
+          var client = new self[0].XMLHttpRequest();
+          let exceptionCtor = self[0].DOMException;
           document.body.removeChild(document.getElementsByTagName("iframe")[0])
-          assert_throws_dom("InvalidStateError", function() {
+          assert_throws_dom("InvalidStateError", exceptionCtor, function() {
             client.open("GET", "folder.txt")
-          }, "open() when associated document's IFRAME is removed")
-          })
+          }, "open() when associated document's IFRAME is removed");
+        });
       }
     </script>
     <iframe src="resources/init.htm"></iframe>
diff --git a/tests/wpt/web-platform-tests/xhr/open-url-multi-window-3.htm b/tests/wpt/web-platform-tests/xhr/open-url-multi-window-3.htm
index cfce8310dc4..e156857fe05 100644
--- a/tests/wpt/web-platform-tests/xhr/open-url-multi-window-3.htm
+++ b/tests/wpt/web-platform-tests/xhr/open-url-multi-window-3.htm
@@ -10,12 +10,13 @@
     <script>
       function init() {
         test(function() {
-          var client = new self[0].XMLHttpRequest()
+          var client = new self[0].XMLHttpRequest();
+          let exceptionCtor = self[0].DOMException;
           client.open("GET", "folder.txt")
           document.body.removeChild(document.getElementsByTagName("iframe")[0])
-          assert_throws_dom("InvalidStateError", function() {
+          assert_throws_dom("InvalidStateError", exceptionCtor, function() {
             client.send(null)
-          }, "send() when associated document's IFRAME is removed")
+          }, "send() when associated document's IFRAME is removed");
         })
       }
     </script>
diff --git a/tests/wpt/web-platform-tests/xhr/open-url-multi-window-5.htm b/tests/wpt/web-platform-tests/xhr/open-url-multi-window-5.htm
index 40a3429fbb4..32c467a4956 100644
--- a/tests/wpt/web-platform-tests/xhr/open-url-multi-window-5.htm
+++ b/tests/wpt/web-platform-tests/xhr/open-url-multi-window-5.htm
@@ -11,15 +11,17 @@
     <script>
       var test = async_test(),
           client,
-          count = 0
+          exceptionCtor,
+          count = 0;
       function init() {
         test.step(function() {
           if(0 == count) {
-            client = new self[0].XMLHttpRequest()
+            client = new self[0].XMLHttpRequest();
+            exceptionCtor = self[0].DOMException;
             count++
             self[0].location.reload()
           } else if(1 == count) {
-            assert_throws_dom("InvalidStateError", function() { client.open("GET", "...") })
+            assert_throws_dom("InvalidStateError", exceptionCtor, function() {client.open("GET", "...") });
             test.done()
           }
         })