| Index: chrome/browser/io_thread.h
|
| diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h
|
| index 6152d1305e3d9f39bcdddbafec574f2fe3903d94..2e22994185c73c163ca5f64ed256ede0f499ded6 100644
|
| --- a/chrome/browser/io_thread.h
|
| +++ b/chrome/browser/io_thread.h
|
| @@ -46,6 +46,7 @@ class EventRouterForwarder;
|
|
|
| namespace net {
|
| class CertVerifier;
|
| +class ChannelIDService;
|
| class CookieStore;
|
| class CTVerifier;
|
| class FtpTransactionFactory;
|
| @@ -56,7 +57,6 @@ class HttpServerProperties;
|
| class HttpTransactionFactory;
|
| class HttpUserAgentSettings;
|
| class NetworkDelegate;
|
| -class ServerBoundCertService;
|
| class ProxyConfigService;
|
| class ProxyService;
|
| class SSLConfigService;
|
| @@ -121,8 +121,8 @@ class IOThread : public content::BrowserThreadDelegate {
|
| scoped_ptr<net::NetworkDelegate> system_network_delegate;
|
| scoped_ptr<net::HostResolver> host_resolver;
|
| scoped_ptr<net::CertVerifier> cert_verifier;
|
| - // The ServerBoundCertService must outlive the HttpTransactionFactory.
|
| - scoped_ptr<net::ServerBoundCertService> system_server_bound_cert_service;
|
| + // The ChannelIDService must outlive the HttpTransactionFactory.
|
| + scoped_ptr<net::ChannelIDService> system_channel_id_service;
|
| // This TransportSecurityState doesn't load or save any state. It's only
|
| // used to enforce pinning for system requests and will only use built-in
|
| // pins.
|
| @@ -152,7 +152,7 @@ class IOThread : public content::BrowserThreadDelegate {
|
| scoped_ptr<net::URLRequestJobFactory> system_url_request_job_factory;
|
| scoped_ptr<net::URLRequestContext> system_request_context;
|
| SystemRequestContextLeakChecker system_request_context_leak_checker;
|
| - // |system_cookie_store| and |system_server_bound_cert_service| are shared
|
| + // |system_cookie_store| and |system_channel_id_service| are shared
|
| // between |proxy_script_fetcher_context| and |system_request_context|.
|
| scoped_refptr<net::CookieStore> system_cookie_store;
|
| #if defined(ENABLE_EXTENSIONS)
|
|
|