GitLab

A smidge of refactoring for the user agent string code as well.

(Relanding crrev.com/c/1951446 after fixing MacOSX cpuinfo)

Bug: 1001125
Change-Id: I237011f3d85bde2cfe8bcf40731b442df27fe481
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1955958Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: Richard Coles <torne@chromium.org>
Commit-Queue: Aaron Tagliaboschi <aarontag@chromium.org>
Cr-Commit-Position: refs/heads/master@{#723035}