summaryrefslogtreecommitdiffstats
path: root/chrome/browser/net/chrome_url_request_context.cc
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-21 01:28:58 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-21 01:28:58 +0000
commitc09860fcca062ea9a0c7cc1ab87863ddf5e9352d (patch)
tree03a3c1d2872d79c446666e260b1c209eaf80c5e3 /chrome/browser/net/chrome_url_request_context.cc
parent2fc03b5d04ade79f434d9418b01dcd797a3a927c (diff)
downloadchromium_src-c09860fcca062ea9a0c7cc1ab87863ddf5e9352d.zip
chromium_src-c09860fcca062ea9a0c7cc1ab87863ddf5e9352d.tar.gz
chromium_src-c09860fcca062ea9a0c7cc1ab87863ddf5e9352d.tar.bz2
revert r29588.
John says the DB thread always gets shut down by the IO thread, so the change is unnecessary, also, it caused valgrind leaks. BUG=25245 Review URL: http://codereview.chromium.org/293039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29596 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net/chrome_url_request_context.cc')
-rw-r--r--chrome/browser/net/chrome_url_request_context.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc
index bfa396d..368e95e 100644
--- a/chrome/browser/net/chrome_url_request_context.cc
+++ b/chrome/browser/net/chrome_url_request_context.cc
@@ -164,7 +164,9 @@ ChromeURLRequestContext* ChromeURLRequestContext::CreateOriginal(
DCHECK(!cookie_store_path.empty());
scoped_refptr<SQLitePersistentCookieStore> cookie_db =
- new SQLitePersistentCookieStore(cookie_store_path);
+ new SQLitePersistentCookieStore(
+ cookie_store_path,
+ g_browser_process->db_thread()->message_loop());
context->cookie_store_ = new net::CookieMonster(cookie_db.get());
}
@@ -191,7 +193,9 @@ ChromeURLRequestContext* ChromeURLRequestContext::CreateOriginalForExtensions(
DCHECK(!cookie_store_path.empty());
scoped_refptr<SQLitePersistentCookieStore> cookie_db =
- new SQLitePersistentCookieStore(cookie_store_path);
+ new SQLitePersistentCookieStore(
+ cookie_store_path,
+ g_browser_process->db_thread()->message_loop());
net::CookieMonster* cookie_monster = new net::CookieMonster(cookie_db.get());
// Enable cookies for extension URLs only.