Revert 232205 "Fix build of TestCompositorHostOzone"

> Fix build of TestCompositorHostOzone
> 
> Review URL: https://codereview.chromium.org/47733004

TBR=spang@chromium.org

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

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