Refactoring change only.

BUG=angleproject:2207

Change-Id: Id05972d2084f3254745cbf55d1b7577306020466
Reviewed-on: https://chromium-review.googlesource.com/742373
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>