Revert of Fix ChromeVox Next compile.

Revert of Fix ChromeVox Next compile. (patchset #3 id:30001 of https://codereview.chromium.org/613223003/)

Reason for revert:
Still causing errors in compile.

Original issue's description:
> Fix ChromeVox Next compile.
>
> Committed: https://crrev.com/f72920ef659207f761f8b8233fb597391fc609a8
> Cr-Commit-Position: refs/heads/master@{#297541}

TBR=dmazzoni@chromium.org,plundblad@chromium.org
NOTREECHECKS=true
NOTRY=true

Committed: https://crrev.com/73d3602e7b54b80fbc24d8afda8e5819b04ae2f3
Cr-Commit-Position: refs/heads/master@{#297663}

[David Tseng, 2014-10-01 16:59:53]

Created Revert of Fix ChromeVox Next compile.

[commit-bot: I haz the power, 2014-10-01 17:00:59]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/617323002/1

[commit-bot: I haz the power, 2014-10-01 17:02:07]

Committed patchset #1 (id:1) as 8269960d9bc6295421439d17020d88a80368ccd7

[commit-bot: I haz the power, 2014-10-01 17:02:57]

Patchset 1 (id:??) landed as
https://crrev.com/73d3602e7b54b80fbc24d8afda8e5819b04ae2f3
Cr-Commit-Position: refs/heads/master@{#297663}