summaryrefslogtreecommitdiffstats
path: root/net/url_request
diff options
context:
space:
mode:
authoreroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-10 23:56:23 +0000
committereroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-10 23:56:23 +0000
commit4e637d218c79304fb852ac500c0c4ee21756c6b8 (patch)
treee05d0093f2a41a728cb51efb381b5b221365b24a /net/url_request
parent867f856c7d42ec02b348c2d2a92fba2bd2c95ceb (diff)
downloadchromium_src-4e637d218c79304fb852ac500c0c4ee21756c6b8.zip
chromium_src-4e637d218c79304fb852ac500c0c4ee21756c6b8.tar.gz
chromium_src-4e637d218c79304fb852ac500c0c4ee21756c6b8.tar.bz2
Revert 38694 - For some reason this seems to be hanging chrome frame tests, even though this should be a strictly no-op change...
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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38707 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request')
-rw-r--r--net/url_request/url_request_unittest.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/url_request/url_request_unittest.h b/net/url_request/url_request_unittest.h
index 6ea2c15..16116d9 100644
--- a/net/url_request/url_request_unittest.h
+++ b/net/url_request/url_request_unittest.h
@@ -164,7 +164,7 @@ class TestURLRequestContext : public URLRequestContext {
ssl_config_service_),
disk_cache::CreateInMemoryCacheBackend(0));
// In-memory cookie store.
- cookie_store_ = new net::CookieMonster(NULL);
+ cookie_store_ = new net::CookieMonster();
accept_language_ = "en-us,fr";
accept_charset_ = "iso-8859-1,*,utf-8";
}