GitLab

This change fixes some minor errors and warnings.

Also put the custom icon code behind a DISABLE_CUSTOM_ICON flag. This code wasn't used by the browser and it was emitting some warnings.

BUG=112651
TEST=


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

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