Reland part of r62043 that got reverted.
Reland part of r62043 that got reverted.

I tried to repro this bug and could not.  Seems to work.

BUG=58553,28083
TEST=python chrome/test/functional/cookies.py cookies.CookiesTest.testCookiesFile

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

git-svn-id: http://src.chromium.org/svn/trunk/src@69106 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

Former-commit-id: cbfc17c41f3c50ab8bfdf0bb09040c05267d7f64
meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser