bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Disable channel ID support (issue #1912)

This commit is contained in:
Marshall Greenblatt 2016-11-02 15:13:55 -04:00
parent a87f0975e2
commit 7543d16cce
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libcef/browser/net/url_request_context_getter_impl.cc
View File

@ -49,8 +49,6 @@
#include "net/http/http_util.h" #include "net/http/http_util.h"
#include "net/http/transport_security_state.h" #include "net/http/transport_security_state.h"
#include "net/proxy/proxy_service.h" #include "net/proxy/proxy_service.h"
#include "net/ssl/channel_id_service.h"
#include "net/ssl/default_channel_id_store.h"
#include "net/ssl/ssl_config_service_defaults.h" #include "net/ssl/ssl_config_service_defaults.h"
#include "url/url_constants.h" #include "url/url_constants.h"
#include "net/url_request/http_user_agent_settings.h" #include "net/url_request/http_user_agent_settings.h"
@ -210,11 +208,6 @@ net::URLRequestContext* CefURLRequestContextGetterImpl::GetURLRequestContext() {
network_delegate->set_force_google_safesearch(&force_google_safesearch_); network_delegate->set_force_google_safesearch(&force_google_safesearch_);
storage_->set_network_delegate(std::move(network_delegate)); storage_->set_network_delegate(std::move(network_delegate));
storage_->set_channel_id_service(base::WrapUnique(
new net::ChannelIDService(
new net::DefaultChannelIDStore(NULL),
base::WorkerPool::GetTaskRunner(true))));
const std::string& accept_language = const std::string& accept_language =
settings_.accept_language_list.length > 0 ? settings_.accept_language_list.length > 0 ?
CefString(&settings_.accept_language_list): "en-US,en"; CefString(&settings_.accept_language_list): "en-US,en";
@ -296,8 +289,6 @@ net::URLRequestContext* CefURLRequestContextGetterImpl::GetURLRequestContext() {
url_request_context_->cert_transparency_verifier(); url_request_context_->cert_transparency_verifier();
network_session_params.ct_policy_enforcer = network_session_params.ct_policy_enforcer =
url_request_context_->ct_policy_enforcer(); url_request_context_->ct_policy_enforcer();
network_session_params.channel_id_service =
url_request_context_->channel_id_service();
network_session_params.proxy_service = network_session_params.proxy_service =
url_request_context_->proxy_service(); url_request_context_->proxy_service();
network_session_params.ssl_config_service = network_session_params.ssl_config_service =