| Index: chrome/browser/io_thread.cc
|
| ===================================================================
|
| --- chrome/browser/io_thread.cc (revision 99284)
|
| +++ chrome/browser/io_thread.cc (working copy)
|
| @@ -338,6 +338,7 @@
|
| // dependencies and (2) make IOThread more flexible for testing.
|
| IOThread::IOThread(
|
| PrefService* local_state,
|
| + SpdyConfigServiceManager* spdy_config_service_manager,
|
| ChromeNetLog* net_log,
|
| ExtensionEventRouterForwarder* extension_event_router_forwarder)
|
| : BrowserProcessSubThread(BrowserThread::IO),
|
| @@ -362,6 +363,7 @@
|
| pref_proxy_config_tracker_ = new PrefProxyConfigTracker(local_state);
|
| ChromeNetworkDelegate::InitializeReferrersEnabled(&system_enable_referrers_,
|
| local_state);
|
| + spdy_config_service_manager_ = spdy_config_service_manager;
|
| ssl_config_service_manager_.reset(
|
| SSLConfigServiceManager::CreateDefaultManager(local_state));
|
| MessageLoop::current()->PostTask(FROM_HERE,
|
| @@ -466,6 +468,7 @@
|
| CreateGlobalHostResolver(net_log_));
|
| globals_->cert_verifier.reset(new net::CertVerifier);
|
| globals_->dnsrr_resolver.reset(new net::DnsRRResolver);
|
| + globals_->spdy_config_service = GetSpdyConfigService();
|
| globals_->ssl_config_service = GetSSLConfigService();
|
| globals_->http_auth_handler_factory.reset(CreateDefaultAuthHandlerFactory(
|
| globals_->host_resolver.get()));
|
| @@ -489,6 +492,7 @@
|
| globals_->http_auth_handler_factory.get();
|
| session_params.network_delegate = globals_->system_network_delegate.get();
|
| session_params.net_log = net_log_;
|
| + session_params.spdy_config_service = globals_->spdy_config_service;
|
| session_params.ssl_config_service = globals_->ssl_config_service;
|
| scoped_refptr<net::HttpNetworkSession> network_session(
|
| new net::HttpNetworkSession(session_params));
|
| @@ -654,6 +658,10 @@
|
| }
|
| }
|
|
|
| +net::SpdyConfigService* IOThread::GetSpdyConfigService() {
|
| + return spdy_config_service_manager_->Get();
|
| +}
|
| +
|
| net::SSLConfigService* IOThread::GetSSLConfigService() {
|
| return ssl_config_service_manager_->Get();
|
| }
|
| @@ -697,6 +705,7 @@
|
| system_params.dns_cert_checker = NULL;
|
| system_params.ssl_host_info_factory = NULL;
|
| system_params.proxy_service = globals_->system_proxy_service.get();
|
| + system_params.spdy_config_service = globals_->spdy_config_service.get();
|
| system_params.ssl_config_service = globals_->ssl_config_service.get();
|
| system_params.http_auth_handler_factory =
|
| globals_->http_auth_handler_factory.get();
|
|
|