Hidden conflict with Geoff's test refactor patch.

BUG=angleproject:1014

This reverts commit 396ee48b.

Change-Id: I8182acb350b61b31f4040a20c86652e23706905a
Reviewed-on: https://chromium-review.googlesource.com/276774Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>