BUG=331453,380238
TBR=bauerb@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274562 0039d316-1c4b-4281-b951-d872f2087c98