| Index: chrome/browser/io_thread.h
|
| diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h
|
| index b7ca041b63978eeeddf1ec4473125169e29ce5d3..81526bcd98f086bbabb464a17b490886fe970254 100644
|
| --- a/chrome/browser/io_thread.h
|
| +++ b/chrome/browser/io_thread.h
|
| @@ -81,6 +81,7 @@ class ProxyConfigService;
|
| class ProxyService;
|
| class SSLConfigService;
|
| class TransportSecurityState;
|
| +class TrustedSpdyProxyProvider;
|
| class URLRequestBackoffManager;
|
| class URLRequestContext;
|
| class URLRequestContextGetter;
|
| @@ -208,7 +209,10 @@ class IOThread : public content::BrowserThreadDelegate {
|
| Optional<bool> enable_spdy_ping_based_connection_checking;
|
| Optional<net::NextProto> spdy_default_protocol;
|
| net::NextProtoVector next_protos;
|
| - Optional<std::string> trusted_spdy_proxy;
|
| + // |trusted_spdy_proxy_provider| provides a trusted SPDY proxy that is
|
| + // allowed to push cross-origin resources. |trusted_spdy_proxy_provider|
|
| + // may be NULL.
|
| + scoped_ptr<net::TrustedSpdyProxyProvider> trusted_spdy_proxy_provider;
|
| std::set<net::HostPortPair> forced_spdy_exclusions;
|
| Optional<bool> use_alternative_services;
|
| Optional<double> alternative_service_probability_threshold;
|
|
|