Clean up more expectations

similar to https://crrev.com/c/2376484, without being limited to
wpt-importer. Manually checked and adjusted the change.

Fixed: 1115767
Change-Id: I54426b19dab75e5e5150220cae3afa7e2d165a35
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2377111
Commit-Queue: Robert Ma <robertma@chromium.org>
Commit-Queue: Rakib Hasan <rmhasan@google.com>
Reviewed-by: Rakib Hasan <rmhasan@google.com>
Auto-Submit: Robert Ma <robertma@chromium.org>
Cr-Commit-Position: refs/heads/master@{#801853}