diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-11 01:11:25 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-11 01:11:25 +0000 |
| commit | 5410255169e0b4d3f20446e970166168890f000a (patch) | |
| tree | 62c4a3e077e6992b0a28fe88e68d61e90fd3aed3 /chrome/browser/sync | |
| parent | fcad492f2e69ba9b91b5eb2108ee381dbe5047d5 (diff) | |
| download | chromium_src-5410255169e0b4d3f20446e970166168890f000a.zip chromium_src-5410255169e0b4d3f20446e970166168890f000a.tar.gz chromium_src-5410255169e0b4d3f20446e970166168890f000a.tar.bz2 | |
Revert the revert... This has the cumulative effect of relanding 38694.
The chrome frame failure appears to be unrelated.
Add some tests to CookieMonster for overwriting persistent cookies, and checking that the PersistentCookieStore interface is exercised correctly.
Review URL: http://codereview.chromium.org/600040
TBR=eroman@chromium.org
Review URL: http://codereview.chromium.org/596048
TBR=eroman@chromium.org
Review URL: http://codereview.chromium.org/604012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38728 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
| -rw-r--r-- | chrome/browser/sync/glue/http_bridge.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/sync/glue/http_bridge.cc b/chrome/browser/sync/glue/http_bridge.cc index 95d95ac..bf54eeb 100644 --- a/chrome/browser/sync/glue/http_bridge.cc +++ b/chrome/browser/sync/glue/http_bridge.cc @@ -65,7 +65,7 @@ HttpBridge::RequestContext::RequestContext(URLRequestContext* baseline_context) : baseline_context_(baseline_context) { // Create empty, in-memory cookie store. - cookie_store_ = new net::CookieMonster(); + cookie_store_ = new net::CookieMonster(NULL); // We don't use a cache for bridged loads, but we do want to share proxy info. host_resolver_ = baseline_context->host_resolver(); |