Emergency CL to fix official compile issue.

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