bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 194165.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1221 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-04-15 22:16:01 +00:00
parent 414befcd92
commit bb6eeee686
47 changed files with 154 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libcef/browser/url_request_context_getter.cc
View File

@@ -26,11 +26,11 @@
#include "base/threading/thread_restrictions.h"
#include "base/threading/worker_pool.h"
#include "chrome/browser/net/proxy_service_factory.h"
#include "chrome/browser/net/sqlite_persistent_cookie_store.h"
#include "content/browser/net/sqlite_persistent_cookie_store.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/common/content_switches.h"
#include "content/public/common/url_constants.h"
#include "net/base/cert_verifier.h"
#include "net/cert/cert_verifier.h"
#include "net/cookies/cookie_monster.h"
#include "net/dns/host_resolver.h"
#include "net/ftp/ftp_network_layer.h"
@@ -55,8 +55,8 @@ using content::BrowserThread;
#endif
CefURLRequestContextGetter::CefURLRequestContextGetter(
MessageLoop* io_loop,
MessageLoop* file_loop,
base::MessageLoop* io_loop,
base::MessageLoop* file_loop,
content::ProtocolHandlerMap* protocol_handlers)
: io_loop_(io_loop),
file_loop_(file_loop) {
@@ -203,7 +203,7 @@ void CefURLRequestContextGetter::SetCookieStoragePath(
return;
}
scoped_refptr<SQLitePersistentCookieStore> persistent_store;
scoped_refptr<content::SQLitePersistentCookieStore> persistent_store;
if (!path.empty()) {
// TODO(cef): Move directory creation to the blocking pool instead of
// allowing file IO on this thread.
@@ -212,7 +212,7 @@ void CefURLRequestContextGetter::SetCookieStoragePath(
file_util::CreateDirectory(path)) {
const base::FilePath& cookie_path = path.AppendASCII("Cookies");
persistent_store =
new SQLitePersistentCookieStore(
new content::SQLitePersistentCookieStore(
cookie_path,
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO),
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB),