Land patch by agl@chromium.org to hopefully fix build failure on Ubuntu with GCC 4.4.
Land patch by agl@chromium.org to hopefully fix build failure on
Ubuntu with GCC 4.4.

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


git-svn-id: b158db1e4b4ab85d4c9e510fdef4b1e8c614b15b@2726 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

UniversalFuture/moosh,UniversalFuture/moosh,UniversalFuture/moosh,UniversalFuture/moosh