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

3 files changed, 5 insertions, 5 deletions

diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc
index 0fe660b..e206121 100644
--- a/chrome/browser/net/chrome_url_request_context.cc
+++ b/chrome/browser/net/chrome_url_request_context.cc
@@ -167,7 +167,7 @@ ChromeURLRequestContext* FactoryForOriginal::Create() {
 
   if (record_mode || playback_mode) {
     // Don't use existing cookies and use an in-memory store.
-    context->set_cookie_store(new net::CookieMonster());
+    context->set_cookie_store(new net::CookieMonster(NULL));
     cache->set_mode(
         record_mode ? net::HttpCache::RECORD : net::HttpCache::PLAYBACK);
   }
@@ -264,7 +264,7 @@ ChromeURLRequestContext* FactoryForOffTheRecord::Create() {
       new net::HttpCache(io_thread()->globals()->network_change_notifier.get(),
                          context->host_resolver(), context->proxy_service(),
                          context->ssl_config_service(), 0);
-  context->set_cookie_store(new net::CookieMonster);
+  context->set_cookie_store(new net::CookieMonster(NULL));
   context->set_cookie_policy(
       new ChromeCookiePolicy(host_content_settings_map_));
   context->set_http_transaction_factory(cache);
@@ -298,7 +298,7 @@ ChromeURLRequestContext* FactoryForOffTheRecordExtensions::Create() {
   ChromeURLRequestContext* context = new ChromeURLRequestContext;
   ApplyProfileParametersToContext(context);
 
-  net::CookieMonster* cookie_monster = new net::CookieMonster;
+  net::CookieMonster* cookie_monster = new net::CookieMonster(NULL);
 
   // Enable cookies for extension URLs only.
   const char* schemes[] = {chrome::kExtensionScheme};
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();
diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc
index 94ddf97..5cae4f7 100644
--- a/chrome/test/testing_profile.cc
+++ b/chrome/test/testing_profile.cc
@@ -86,7 +86,7 @@ class BookmarkLoadObserver : public BookmarkModelObserver {
 class TestURLRequestContext : public URLRequestContext {
  public:
   TestURLRequestContext() {
-    cookie_store_ = new net::CookieMonster();
+    cookie_store_ = new net::CookieMonster(NULL);
   }
 };