| Index: chrome/browser/io_thread.h
|
| diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h
|
| index 1fb1b4cffde3963ac911ef927bc1cbd3f74b60d3..5b996cc4984bdcea6347d78a2c930b7483c095c9 100644
|
| --- a/chrome/browser/io_thread.h
|
| +++ b/chrome/browser/io_thread.h
|
| @@ -22,6 +22,7 @@
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/browser_thread_delegate.h"
|
| #include "net/base/network_change_notifier.h"
|
| +#include "net/cert/ct_verifier.h"
|
| #include "net/http/http_network_session.h"
|
| #include "net/socket/next_proto.h"
|
|
|
| @@ -48,7 +49,7 @@ class CertPolicyEnforcer;
|
| class CertVerifier;
|
| class ChannelIDService;
|
| class CookieStore;
|
| -class CTVerifier;
|
| +class CTLogVerifier;
|
| class FtpTransactionFactory;
|
| class HostMappingRules;
|
| class HostResolver;
|
| @@ -128,6 +129,7 @@ class IOThread : public content::BrowserThreadDelegate {
|
| // used to enforce pinning for system requests and will only use built-in
|
| // pins.
|
| scoped_ptr<net::TransportSecurityState> transport_security_state;
|
| + std::vector<scoped_refptr<net::CTLogVerifier>> ct_logs;
|
| scoped_ptr<net::CTVerifier> cert_transparency_verifier;
|
| scoped_ptr<net::CertPolicyEnforcer> cert_policy_enforcer;
|
| scoped_refptr<net::SSLConfigService> ssl_config_service;
|
| @@ -157,6 +159,11 @@ class IOThread : public content::BrowserThreadDelegate {
|
| // |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;
|
| + // |cert_transparency_observer| is shared between
|
| + // |proxy_script_fetcher_context| and |system_request_context|. Since
|
| + // it may be performing URLRequests of its own it must be destroyed
|
| + // before both URLRequestContexts.
|
| + scoped_ptr<net::CTVerifier::Observer> cert_transparency_observer;
|
| #if defined(ENABLE_EXTENSIONS)
|
| scoped_refptr<extensions::EventRouterForwarder>
|
| extension_event_router_forwarder;
|
|
|