This CL changes the CookieStore obect to be a refcounted object to get a bett...

chrome/browser/net/chrome_url_request_context.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/net/chrome_url_request_context.h"
 
 #include "base/command_line.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/privacy_blacklist/blacklist.h"
@@ skipping 137 matching lines @@
     context->ftp_transaction_factory_ =
         new net::FtpNetworkLayer(context->host_resolver_);
 #else
   context->ftp_transaction_factory_ =
       new net::FtpNetworkLayer(context->host_resolver_);
 #endif
 
   // setup cookie store
   if (!context->cookie_store_) {
     DCHECK(!cookie_store_path.empty());
-    context->cookie_db_.reset(new SQLitePersistentCookieStore(
-        cookie_store_path.ToWStringHack(),
-        g_browser_process->db_thread()->message_loop()));
-    context->cookie_store_ = new net::CookieMonster(context->cookie_db_.get());
+
+    scoped_refptr<SQLitePersistentCookieStore> cookie_db =
+        new SQLitePersistentCookieStore(
+            cookie_store_path.ToWStringHack(),
+            g_browser_process->db_thread()->message_loop());
+    context->cookie_store_ = new net::CookieMonster(cookie_db.get());
   }
 
   return context;
 }
 
 // static
 ChromeURLRequestContext* ChromeURLRequestContext::CreateOriginalForMedia(
     Profile* profile, const FilePath& disk_cache_path, int cache_size) {
   DCHECK(!profile->IsOffTheRecord());
   return CreateRequestContextForMedia(profile, disk_cache_path, cache_size,
                                       false);
 }
 
 // static
 ChromeURLRequestContext* ChromeURLRequestContext::CreateOriginalForExtensions(
     Profile* profile, const FilePath& cookie_store_path) {
   DCHECK(!profile->IsOffTheRecord());
   ChromeURLRequestContext* context = new ChromeURLRequestContext(profile);
 
   // All we care about for extensions is the cookie store.
   DCHECK(!cookie_store_path.empty());
-  context->cookie_db_.reset(new SQLitePersistentCookieStore(
-      cookie_store_path.ToWStringHack(),
-      g_browser_process->db_thread()->message_loop()));
-  net::CookieMonster* cookie_monster = new net::CookieMonster(
-      context->cookie_db_.get());
+
+  scoped_refptr<SQLitePersistentCookieStore> cookie_db =
+      new SQLitePersistentCookieStore(
+          cookie_store_path.ToWStringHack(),
+          g_browser_process->db_thread()->message_loop());
+  net::CookieMonster* cookie_monster = new net::CookieMonster(cookie_db.get());
 
   // Enable cookies for extension URLs only.
   const char* schemes[] = {chrome::kExtensionScheme};
   cookie_monster->SetCookieableSchemes(schemes, 1);
   context->cookie_store_ = cookie_monster;
 
   return context;
 }
 
 // static
@@ skipping 337 matching lines @@
 ChromeURLRequestContext::~ChromeURLRequestContext() {
   DCHECK(NULL == prefs_);
 
   NotificationService::current()->Notify(
       NotificationType::URL_REQUEST_CONTEXT_RELEASED,
       Source<URLRequestContext>(this),
       NotificationService::NoDetails());
 
   delete ftp_transaction_factory_;
   delete http_transaction_factory_;
-
-  // Do not delete the cookie store in the case of the media context, as it is
-  // owned by the original context.
-  // TODO(eroman): The lifetime expectation of cookie_store_ is not right.
-  // The assumption here is that the original request context (which owns
-  // cookie_store_) is going to outlive the media context (which uses it).
-  // However based on the destruction order of profiles this is not true.
-  // http://crbug.com/15289.
-  if (!is_media_)
-    delete cookie_store_;
 }