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 157509.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@835 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-10-03 19:52:50 +00:00
parent ecf5ff4c6e
commit 2592b05444
11 changed files with 55 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
libcef/browser/url_request_context_getter.cc
View File

@@ -121,10 +121,12 @@ class CefProxyResolver : public net::ProxyResolver {
} // namespace
CefURLRequestContextGetter::CefURLRequestContextGetter(
bool ignore_certificate_errors,
const FilePath& base_path,
MessageLoop* io_loop,
MessageLoop* file_loop)
: base_path_(base_path),
: ignore_certificate_errors_(ignore_certificate_errors),
base_path_(base_path),
io_loop_(io_loop),
file_loop_(file_loop) {
// Must first be created on the UI thread.
@@ -256,20 +258,28 @@ net::URLRequestContext* CefURLRequestContextGetter::GetURLRequestContext() {
BrowserThread::GetMessageLoopProxyForThread(
BrowserThread::CACHE));
net::HttpCache* main_cache = new net::HttpCache(
url_request_context_->host_resolver(),
url_request_context_->cert_verifier(),
url_request_context_->server_bound_cert_service(),
NULL, /* tranport_security_state */
url_request_context_->proxy_service(),
"", /* ssl_session_cache_shard */
url_request_context_->ssl_config_service(),
url_request_context_->http_auth_handler_factory(),
NULL, /* network_delegate */
url_request_context_->http_server_properties(),
NULL,
main_backend,
"" /* trusted_spdy_proxy */);
net::HttpNetworkSession::Params network_session_params;
network_session_params.host_resolver =
url_request_context_->host_resolver();
network_session_params.cert_verifier =
url_request_context_->cert_verifier();
network_session_params.server_bound_cert_service =
url_request_context_->server_bound_cert_service();
network_session_params.proxy_service =
url_request_context_->proxy_service();
network_session_params.ssl_config_service =
url_request_context_->ssl_config_service();
network_session_params.http_auth_handler_factory =
url_request_context_->http_auth_handler_factory();
network_session_params.network_delegate =
url_request_context_->network_delegate();
network_session_params.http_server_properties =
url_request_context_->http_server_properties();
network_session_params.ignore_certificate_errors =
ignore_certificate_errors_;
net::HttpCache* main_cache = new net::HttpCache(network_session_params,
main_backend);
storage_->set_http_transaction_factory(main_cache);
storage_->set_ftp_transaction_factory(