GitLab

Just fixes some low hanging fruit here.
(other big deps on DisplayManager; ScreenOrientationController)

BUG=619636
TEST=compiles; unit tests; no behavior changes.
R=jamescook@chromium.org

Review-Url: https://codereview.chromium.org/2131823003
Cr-Commit-Position: refs/heads/master@{#404516}