diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-15 20:24:17 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-15 20:24:17 +0000 |
| commit | 1ed78a31b405c4b85a3747d697e464508e7c4399 (patch) | |
| tree | f76654969406d9bfe3d8a5ca70f4fcb76f5199f8 /chrome/browser/net/chrome_url_request_context.cc | |
| parent | 2627431bef905332e55a90960aed8049b681689f (diff) | |
| download | chromium_src-1ed78a31b405c4b85a3747d697e464508e7c4399.zip chromium_src-1ed78a31b405c4b85a3747d697e464508e7c4399.tar.gz chromium_src-1ed78a31b405c4b85a3747d697e464508e7c4399.tar.bz2 | |
Convert the sqlite cookie database and web database to use the new sqlite
wrapper. This also moves and renamed the old cookie_monster_sqlite file to
match the class name.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/201099
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26260 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.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc index 4683e61..27d8e82 100644 --- a/chrome/browser/net/chrome_url_request_context.cc +++ b/chrome/browser/net/chrome_url_request_context.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 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. @@ -11,6 +11,7 @@ #include "chrome/browser/chrome_thread.h" #include "chrome/browser/extensions/extensions_service.h" #include "chrome/browser/extensions/user_script_master.h" +#include "chrome/browser/net/sqlite_persistent_cookie_store.h" #include "chrome/browser/net/dns_global.h" #include "chrome/browser/profile.h" #include "chrome/common/chrome_constants.h" @@ -158,7 +159,7 @@ ChromeURLRequestContext* ChromeURLRequestContext::CreateOriginal( scoped_refptr<SQLitePersistentCookieStore> cookie_db = new SQLitePersistentCookieStore( - cookie_store_path.ToWStringHack(), + cookie_store_path, g_browser_process->db_thread()->message_loop()); context->cookie_store_ = new net::CookieMonster(cookie_db.get()); } @@ -185,7 +186,7 @@ ChromeURLRequestContext* ChromeURLRequestContext::CreateOriginalForExtensions( scoped_refptr<SQLitePersistentCookieStore> cookie_db = new SQLitePersistentCookieStore( - cookie_store_path.ToWStringHack(), + cookie_store_path, g_browser_process->db_thread()->message_loop()); net::CookieMonster* cookie_monster = new net::CookieMonster(cookie_db.get()); |