| Index: chrome/browser/io_thread.h
|
| ===================================================================
|
| --- chrome/browser/io_thread.h (revision 99284)
|
| +++ chrome/browser/io_thread.h (working copy)
|
| @@ -12,6 +12,7 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/task.h"
|
| #include "chrome/browser/browser_process_sub_thread.h"
|
| +#include "chrome/browser/net/spdy_config_service_manager.h"
|
| #include "chrome/browser/net/ssl_config_service_manager.h"
|
| #include "chrome/browser/prefs/pref_member.h"
|
| #include "chrome/common/net/predictor_common.h"
|
| @@ -46,6 +47,7 @@
|
| class OriginBoundCertService;
|
| class ProxyConfigService;
|
| class ProxyService;
|
| +class SpdyConfigService;
|
| class SSLConfigService;
|
| class URLRequestContext;
|
| class URLRequestContextGetter;
|
| @@ -70,6 +72,7 @@
|
| scoped_ptr<net::HostResolver> host_resolver;
|
| scoped_ptr<net::CertVerifier> cert_verifier;
|
| scoped_ptr<net::DnsRRResolver> dnsrr_resolver;
|
| + scoped_refptr<net::SpdyConfigService> spdy_config_service;
|
| scoped_refptr<net::SSLConfigService> ssl_config_service;
|
| scoped_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory;
|
| scoped_ptr<net::ProxyService> proxy_script_fetcher_proxy_service;
|
| @@ -99,6 +102,7 @@
|
|
|
| // |net_log| must either outlive the IOThread or be NULL.
|
| IOThread(PrefService* local_state,
|
| + SpdyConfigServiceManager* spdy_config_service_manager,
|
| ChromeNetLog* net_log,
|
| ExtensionEventRouterForwarder* extension_event_router_forwarder);
|
|
|
| @@ -167,6 +171,9 @@
|
| // called on the IO thread.
|
| void ClearHostCache();
|
|
|
| + // Returns an SpdyConfigService instance.
|
| + net::SpdyConfigService* GetSpdyConfigService();
|
| +
|
| // Returns an SSLConfigService instance.
|
| net::SSLConfigService* GetSSLConfigService();
|
|
|
| @@ -202,6 +209,10 @@
|
| std::string auth_delegate_whitelist_;
|
| std::string gssapi_library_name_;
|
|
|
| + // This is an instance of the default SpdyConfigServiceManager for the current
|
| + // platform and it gets SPDY preferences from user preferences.
|
| + scoped_refptr<SpdyConfigServiceManager> spdy_config_service_manager_;
|
| +
|
| // This is an instance of the default SSLConfigServiceManager for the current
|
| // platform and it gets SSL preferences from local_state object.
|
| scoped_ptr<SSLConfigServiceManager> ssl_config_service_manager_;
|
|
|