Revert of Revert of Fix closure compile after https://codereview.chromium.org/1212653...

Revert of Revert of Fix closure compile after https://codereview.chromium.org/1212653010/ (patchset #1 id:1 of https://codereview.chromium.org/1218783009/)

Reason for revert:
The MSan bots just seem to be flaky.  They were fixed before picking up my revert :(.

Original issue's description:
> Revert of Fix closure compile after https://codereview.chromium.org/1212653010/ (patchset #1 id:1 of https://codereview.chromium.org/1213063010/)
>
> Reason for revert:
> http://build.chromium.org/p/chromium.memory.fyi/builders/Linux%20ChromeOS%20MSan%20Tests/builds/2553
>
> Original issue's description:
> > Fix closure compile after https://codereview.chromium.org/1212653010/
> >
> > TBR=yoshiki@chromium.org
> > BUG=none
> > TEST=green closure compiler bots
> >
> > Committed: https://crrev.com/d3cb15365f7cca8be2d794be25be88f6a72771a4
> > Cr-Commit-Position: refs/heads/master@{#337092}
>
> TBR=yoshiki@chromium.org,smckay@chromium.org
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=none
>
> Committed: https://crrev.com/69033adfca97ce4d96593cfabf091723231b992b
> Cr-Commit-Position: refs/heads/master@{#337124}

TBR=yoshiki@chromium.org,smckay@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=none

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

Cr-Commit-Position: refs/heads/master@{#337143}