| Index: chrome/browser/io_thread.h
|
| diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h
|
| index 3441fe9f5eb47f7003247e08a99bfbf14730cd26..27545af7734b551e6ee45d79743d6ad8114f578a 100644
|
| --- a/chrome/browser/io_thread.h
|
| +++ b/chrome/browser/io_thread.h
|
| @@ -45,6 +45,7 @@ class EventRouterForwarder;
|
|
|
| namespace net {
|
| class CertVerifier;
|
| +class ChannelIDService;
|
| class CookieStore;
|
| class CTVerifier;
|
| class FtpTransactionFactory;
|
| @@ -55,7 +56,6 @@ class HttpServerProperties;
|
| class HttpTransactionFactory;
|
| class HttpUserAgentSettings;
|
| class NetworkDelegate;
|
| -class ServerBoundCertService;
|
| class ProxyConfigService;
|
| class ProxyService;
|
| class SSLConfigService;
|
| @@ -120,8 +120,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.
|
| @@ -151,7 +151,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;
|
| scoped_refptr<extensions::EventRouterForwarder>
|
|
|