This code cleanup is part of a readability review.

Review Bug 12897471

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

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