Hidden conflict with Geoff's test refactor patch.

BUG=angleproject:1014

This reverts commit a3028ab9.

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