Fix style issues

TBR=sky@chromium.org
BUG=none

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

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