Merge https://chromium.googlesource.com/chromium/blink/+/886866f5034d7f30f8aa607b909313f99db1f3b4.
Created attachment 204267 [details] Cleanup
Committed r151415: <http://trac.webkit.org/changeset/151415>