Support both MANIFEST.json formats and update wpt test expectations.
Background: In
http://crrev.com/2610243002 web-platform-tests were imported, and the Port class was updated to handle the new MANIFEST.json format. I originally believed that the new MANIFEST.json would also be committed in that CL, but it wasn't, due to file size. So tests were updated, but no tests were run because they weren't found.
Then, in
http://crrev.com/2615903004, the manifest was actually updated, so tests started being run, but because of the earlier CL, the newly-imported failing tests didn't have expectations updated.
This CL adds a temporary change to the Port class to support both manifest formats, and updates test expectations.
After this CL:
- The new MANIFEST.json should be re-added.
- Port should be updated to support only the new format again.
BUG=
678077
Review-Url:
https://codereview.chromium.org/2614253003
Cr-Commit-Position: refs/heads/master@{#442354}
Committed:
https://chromium.googlesource.com/chromium/src/+/2cdab23afa9bf4d85db6926da0bdae66133f3212