GitLab

Otherwise their own members wouldn't be properly destroyed. Also address
some tiny style nits.

Change-Id: Ia0f08d5d5b972022025e8ca0cc031482fde77b7a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1697207
Commit-Queue: Peter Beverloo <peter@chromium.org>
Auto-Submit: Peter Beverloo <peter@chromium.org>
Reviewed-by: Michael van Ouwerkerk <mvanouwerkerk@chromium.org>
Reviewed-by: Richard Knoll <knollr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#676864}