Revert "Fix warnings on gcc builds in ImageTest.cpp."
Revert "Fix warnings on gcc builds in ImageTest.cpp."

This reverts commit 52ff4ac92ef5dfe77e14221726a0f0ab57dc57d5.

Change-Id: I11ec6e7e343dd6579f7aa13106facc65b05eb795
Reviewed-on: https://chromium-review.googlesource.com/290940
Reviewed-by: Geoff Lang <b6fc25fe0362055230985c05cbfa8adb741ccc0f@chromium.org>
Tested-by: Geoff Lang <b6fc25fe0362055230985c05cbfa8adb741ccc0f@chromium.org>

larsbergstrom/angle,bsergean/angle,larsbergstrom/angle,mikolalysenko/angle,mikolalysenko/angle,csa7mdm/angle,ecoal95/angle,MSOpenTech/angle,ppy/angle,crezefire/angle,vvuk/angle,ecoal95/angle,ppy/angle,ppy/angle,vvuk/angle,larsbergstrom/angle,MSOpenTech/angle,mlfarrell/angle,mybios/angle,mybios/angle,bsergean/angle,mybios/angle,ecoal95/angle,bsergean/angle,mikolalysenko/angle,MSOpenTech/angle,ecoal95/angle,domokit/waterfall,vvuk/angle,ppy/angle,ecoal95/angle,crezefire/angle,csa7mdm/angle,crezefire/angle,mlfarrell/angle,csa7mdm/angle,crezefire/angle,mlfarrell/angle,MSOpenTech/angle,bsergean/angle,domokit/waterfall,csa7mdm/angle,mikolalysenko/angle,mybios/angle,mlfarrell/angle,vvuk/angle,larsbergstrom/angle