GitLab

This is a rebase of adetaylor@'s original CL
https://chromium-review.googlesource.com/c/chromium/src/+/2253149
on top of the refactorings.

Bug: 1105910
Change-Id: Ic6dc70400bcb9aec9f37981ed5e41fa5eb6fa3bb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2410491
Commit-Queue: Mark Brand <markbrand@google.com>
Reviewed-by: Jonathan Metzman <metzman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#811682}