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: svn://svn.chromium.org/chrome/trunk/src@69106 0039d316-1c4b-4281-b951-d872f2087c98