GitLab

  * Original CL was missing a single and critical line.
  * This CL also adds unit tests to verify.

Bug: internal b/138446155
Bug: internal b/141369532
Test: manual and unit test
Change-Id: I99707882c716fc371aa28aa29700f85eecb26638
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1816534Reviewed-by: Alex Sakhartchouk <alexst@chromium.org>
Commit-Queue: Ryan Daum <rdaum@chromium.org>
Cr-Commit-Position: refs/heads/master@{#698568}