GitLab

(Also moves the image forcing to after the image is set so it doesn't get
reset.)

BUG=85443
TEST=compiles

Review URL: http://codereview.chromium.org/7003066

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88412 0039d316-1c4b-4281-b951-d872f2087c98