diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-28 21:54:32 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-28 21:54:32 +0000 |
| commit | f7011fcb7f28651953b1765b241c974e25c8cd40 (patch) | |
| tree | f3a2c97bb98cc12aaca39bb27791998f026b58b7 /chrome/browser/net | |
| parent | 4663213354a9c41ab0e5a785d52bf5c9a9692514 (diff) | |
| download | chromium_src-f7011fcb7f28651953b1765b241c974e25c8cd40.zip chromium_src-f7011fcb7f28651953b1765b241c974e25c8cd40.tar.gz chromium_src-f7011fcb7f28651953b1765b241c974e25c8cd40.tar.bz2 | |
Porting profiles to the Mac.
Review URL: http://codereview.chromium.org/19623
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8831 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net')
| -rw-r--r-- | chrome/browser/net/chrome_url_request_context.cc | 10 | ||||
| -rw-r--r-- | chrome/browser/net/chrome_url_request_context.h | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc index 5cd4688..7a4c3bb 100644 --- a/chrome/browser/net/chrome_url_request_context.cc +++ b/chrome/browser/net/chrome_url_request_context.cc @@ -37,8 +37,8 @@ static net::ProxyInfo* CreateProxyInfo() { // static ChromeURLRequestContext* ChromeURLRequestContext::CreateOriginal( - Profile* profile, const std::wstring& cookie_store_path, - const std::wstring& disk_cache_path) { + Profile* profile, const FilePath& cookie_store_path, + const FilePath& disk_cache_path) { DCHECK(!profile->IsOffTheRecord()); ChromeURLRequestContext* context = new ChromeURLRequestContext(profile); @@ -46,7 +46,8 @@ ChromeURLRequestContext* ChromeURLRequestContext::CreateOriginal( context->proxy_service_ = net::ProxyService::Create(proxy_info.get()); net::HttpCache* cache = - new net::HttpCache(context->proxy_service_, disk_cache_path, 0); + new net::HttpCache(context->proxy_service_, + disk_cache_path.ToWStringHack(), 0); const CommandLine& command_line = *CommandLine::ForCurrentProcess(); bool record_mode = chrome::kRecordModeEnabled && @@ -65,7 +66,8 @@ ChromeURLRequestContext* ChromeURLRequestContext::CreateOriginal( if (!context->cookie_store_) { DCHECK(!cookie_store_path.empty()); context->cookie_db_.reset(new SQLitePersistentCookieStore( - cookie_store_path, g_browser_process->db_thread()->message_loop())); + cookie_store_path.ToWStringHack(), + g_browser_process->db_thread()->message_loop())); context->cookie_store_ = new net::CookieMonster(context->cookie_db_.get()); } diff --git a/chrome/browser/net/chrome_url_request_context.h b/chrome/browser/net/chrome_url_request_context.h index 915322e..f9cfafac 100644 --- a/chrome/browser/net/chrome_url_request_context.h +++ b/chrome/browser/net/chrome_url_request_context.h @@ -25,8 +25,8 @@ class ChromeURLRequestContext : public URLRequestContext, // Create an instance for use with an 'original' (non-OTR) profile. This is // expected to get called on the UI thread. static ChromeURLRequestContext* CreateOriginal( - Profile* profile, const std::wstring& cookie_store_path, - const std::wstring& disk_cache_path); + Profile* profile, const FilePath& cookie_store_path, + const FilePath& disk_cache_path); // Create an instance for use with an OTR profile. This is expected to get // called on the UI thread. |