GitLab

After a bad git rebase, I mistakenly reverted part of a previously
landed CL in a subsequent one.

This is the CL that was partially reverted:
https://chromium-review.googlesource.com/c/chromium/src/+/1990211

This is the CL that did the partial revert:
https://chromium-review.googlesource.com/c/chromium/src/+/1988831

Also, I had to fix a test that was added since then.

Bug: 1040794
Change-Id: Icb662bd0bee94917ba2bc59b20e63289ca9d3247
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2008148Reviewed-by: Matt Falkenhagen <falken@chromium.org>
Commit-Queue: Patrick Monette <pmonette@chromium.org>
Cr-Commit-Position: refs/heads/master@{#733421}