Reapply 379 since it wasn't the issue with the build breakage.


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