Reland r52336.

(I accidentally committed a previous version of the patch (the fixed version
was in codereview since I had switched to my mac to address this exact compile
failure.)

BUG=none
TEST=none
TBR=evan

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

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


CrOS-Libchrome-Original-Commit: a91e1409a1b702892be19b058ad418b92ab4dd28
6 files changed
tree: cb7af6d42af0707f9b7045369ffb434af71afdb6
  1. base/
  2. build/
  3. ipc/
  4. testing/