GitLab

Followup to 475113005, use OVERRIDE macro instead of using override
directly.

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

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