Refactoring patch only.

BUG=angle:571

Change-Id: I17e8c1eb80bdf7c3ec7cc4bad4e70e81590e4a89
Reviewed-on: https://chromium-review.googlesource.com/210644Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>