R=ishell@chromium.org
BUG=chromium:604375
LOG=n

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

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