Unreviewed build fix as followup to 152732

Review URL: https://codereview.chromium.org/17063009

git-svn-id: svn://svn.chromium.org/blink/trunk@152734 bbb929c8-8fbe-4397-9dbb-9b2b20218538
Unreviwed build fix

Review URL: https://codereview.chromium.org/17335012

git-svn-id: svn://svn.chromium.org/blink/trunk@152735 bbb929c8-8fbe-4397-9dbb-9b2b20218538
Revert r152732, r152734, and r152735.

They were committed to a closed tree, and broke build.

BUG=none
TBR=crogers@google.com

Review URL: https://codereview.chromium.org/17063010

git-svn-id: svn://svn.chromium.org/blink/trunk@152736 bbb929c8-8fbe-4397-9dbb-9b2b20218538