Third try at committing this.

Third try at committing this.

Patchset 1 is the original patch ( http://codereview.chromium.org/7833042/ ).
Patchset 2 is the original patch plus a fix to a memory leak from the initial commit ( http://codereview.chromium.org/7831056/ )

On the first try there was a memory leak in a test. I fixed that, but made a mistake in the commit (the committed code did not correspond to the reviewed code). Both commits were reverted.

I then landed a new CL ( http://codereview.chromium.org/7860039/ ) that contained the correct changes combining the first two CLs. This caused an error in heapchecker for which a suppression has subsequently been defined ( http://codereview.chromium.org/7780010 ).

In summary, all of this is reviewed, minus some lint fixes.

BUG=68657
TEST=net_unittests / DeferredCookieTaskTest.* and CookieMonsterTest.*
TBR=estade
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=100932

[erikwright (departed), 2011-09-13 16:37:46]

Hi Evan,

Since you had some questions about my previous attempt to re-land this, I
thought I would get your LGTM before my third attempt.

Other than the lint issues you pointed out, this patch does not differ from the
sum of the first two committed CLs (as reviewed). Unfortunately, when I landed
the second one manually (the commit queue was taking too long and a bot was red)
I forgot I had further modified the local files and the actual committed change
did not correspond to the reviewed change.

I reverted the second attempt to land this because of a seemingly related
heapchecker report, but it turns out to have already been occurring sporadically
before my commit and a suppression has since been committed.

Thanks,

Erik