Even more test cleanup. Some fixes to non-test code that's regressed.

BUG=none
TEST=compiles

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

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