Getting very close to done.

BUG=39240

Review URL: http://codereview.chromium.org/1559022

Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 145ecbde35f4fb20cf384fdae4453234407c7243