Clean-up: Fixes style issues.

This CL addresses the remaining comments at http://crrev.com/121183002 .

TEST=none

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

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