GitLab

The gtests aren't working on the windows bots for
some reason. The hotfix I tried didn't work.
This is a partial revert of
https://chromium-review.googlesource.com/c/chromium/src/+/1985134
and
https://chromium-review.googlesource.com/c/chromium/src/+/1986118

TBR=bsheedy@chromium.org

Bug: 1039019
Change-Id: I1a7bf86bd1b563f46b4a19970e89ae0f89f2c98e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1986342Reviewed-by: Caleb Rouleau <crouleau@chromium.org>
Commit-Queue: Caleb Rouleau <crouleau@chromium.org>
Cr-Commit-Position: refs/heads/master@{#728382}