GitLab

As a follow-up to https://chromium-review.googlesource.com/c/chromium/src/+/2003320
Added a test for the new logic and fixed the test that was broken.

Bug: 1042611
Change-Id: I26f29d782879f28272fc5d544c0a783b7dc948de
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2010789
Commit-Queue: Balazs Engedy <engedy@chromium.org>
Reviewed-by: Balazs Engedy <engedy@chromium.org>
Reviewed-by: Andy Paicu <andypaicu@chromium.org>
Auto-Submit: Andy Paicu <andypaicu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#733921}