GitLab

Also change the order of class instance arguments based on the changes
in https://chromium-review.googlesource.com/c/chromium/src/+/1719427.

Bug: 929661
Change-Id: I4aa10196a7c3716dbcb358f9207bc72e747ff72b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1721833
Auto-Submit: Eric Stevenson <estevenson@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#681688}