Test code paths with/without a few workarounds.

BUG=
TEST=gpu_unittests
R=bajones@chromium.org

Review URL: https://codereview.chromium.org/196743006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256731 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 256731