Reverting r17820 and r17819 due to mac breakage.

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

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