Revert change 379 to see if it fixes the build. Please reapply when it's green.

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