GitLab

This reverts the revert of https://chromiumcodereview.appspot.com/715203004/ by
fixing the build error.

BUG=376014, 376006, 376091

Review URL: https://codereview.chromium.org/868313004

Cr-Commit-Position: refs/heads/master@{#313538}