GitLab

Originally landed at https://chromium-review.googlesource.com/c/chromium/src/+/2045171
but reverted because of a test failure in linux-chromeos-dbg. Fix for
the test failure is included here.

Bug: 1026426
Change-Id: Ia8b824ac020239b1c041f24c71c5e8da1a6706ed
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2051028
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#741706}