This reverts commit 0f57ce8f1a. and 3245b8cb83 for breaking Chromium compile. TBR=machenbach@chromium.org Review URL: https://codereview.chromium.org/743533003 Cr-Commit-Position: refs/heads/master@{#25411}
0f57ce8f1a
3245b8cb83