GitLab

Reland of https://chromium-review.googlesource.com/c/chromium/src/+/1890410

Fixed the includes.

Bug: 1018129
Change-Id: Icf2f66ba71bb723bb495ec6ab756fcae5a1f59a1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1890314
Commit-Queue: Michael van Ouwerkerk <mvanouwerkerk@chromium.org>
Reviewed-by: Richard Knoll <knollr@chromium.org>
Reviewed-by: Mikel Astiz <mastiz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#710835}