Subsequent refactoring of this code will be easier to review if there
won't be unrelated style changes that git cl format insists on doing.

BUG=angleproject:1490
TEST=angle_unittests

Change-Id: I102fd73bd92317ab438e1676422212f644d2859b
Reviewed-on: https://chromium-review.googlesource.com/394649Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>