GitLab

This requires exposing a previously-local-to-the-file function as protected, but
this seems like an OK tradeoff.

In the process, also rejiggered a few things (e.g. eliminated a file-scope using
directive).

BUG=none
TEST=none

Change-Id: I5fafda5ce264370cbe6d67e39f24c58fef7543ee
Reviewed-on: https://chromium-review.googlesource.com/792123
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Mark Pearson <mpearson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#519530}