BUG=chromium:646753
R=titzer@chromium.org

Review-Url: https://codereview.chromium.org/2365633002
Cr-Commit-Position: refs/heads/master@{#39638}