GitLab

- Reorder all overrides to be grouped by interface, and match the
  interface's ordering.
- Remove a second ctor that isn't necessary anymore.
- Remove some unnecessary includes.

Bug: 910518
Change-Id: I4123e4ce9cd8eeac4fd2cef051e094cccc8c7d14
Reviewed-on: https://chromium-review.googlesource.com/c/1356702
Commit-Queue: Marc Treib <treib@chromium.org>
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: Mohamed Amir Yosef <mamir@chromium.org>
Cr-Commit-Position: refs/heads/master@{#613059}