Revert "Nits follow-up to https://chromium-review.googlesource.com/c/chromium/src/+/638550"

This reverts commit 0af3ff209e663b1df60bdd53dac0ffc2ee3d6340.

Reason for revert: Blocking revert of r518433.
Bug: 787683

Original change's description:
> Nits follow-up to https://chromium-review.googlesource.com/c/chromium/src/+/638550
> 
> R=​robliao@chomium.org
> 
> Bug: 708584
> Change-Id: I9c362e5cc3880644392cc6afcf4754d2fc834ea8
> Reviewed-on: https://chromium-review.googlesource.com/783873
> Commit-Queue: Gabriel Charette <gab@chromium.org>
> Reviewed-by: Robert Liao <robliao@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#518521}

TBR=gab@chromium.org,robliao@chromium.org,robliao@chomium.org

Change-Id: I832c5f3aba7073614fa331dc427d9ef0f1053f52
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 708584
Reviewed-on: https://chromium-review.googlesource.com/784571
Reviewed-by: Matt Giuca <mgiuca@chromium.org>
Commit-Queue: Matt Giuca <mgiuca@chromium.org>
Cr-Commit-Position: refs/heads/master@{#518559}
2 files changed