GitLab

This CL modernizes style and removes repetitive code.

Bug: 929449
Test: display_unittests
Change-Id: I55e360d833a5dae345c071f0ba431cd89d68f39e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1553504Reviewed-by: Daniel Nicoara <dnicoara@chromium.org>
Auto-Submit: Dominik Laskowski <domlaskowski@chromium.org>
Commit-Queue: Dominik Laskowski <domlaskowski@chromium.org>
Cr-Commit-Position: refs/heads/master@{#648732}