| Index: net/http/http_network_session.h
|
| diff --git a/net/http/http_network_session.h b/net/http/http_network_session.h
|
| index 1c3d6a992eee371e1669ae0bffdcd4a986d6209b..36c8f19cb6b7524c58a1c7a05dd1c3e568c781e7 100644
|
| --- a/net/http/http_network_session.h
|
| +++ b/net/http/http_network_session.h
|
| @@ -56,6 +56,7 @@ class SSLClientSocketPool;
|
| class SSLConfigService;
|
| class TransportClientSocketPool;
|
| class TransportSecurityState;
|
| +class TrustedSpdyProxyProvider;
|
|
|
| // This class holds session objects used by HttpNetworkTransaction objects.
|
| class NET_EXPORT HttpNetworkSession
|
| @@ -101,9 +102,10 @@ class NET_EXPORT HttpNetworkSession
|
| size_t spdy_initial_max_concurrent_streams;
|
| // Source of time for SPDY connections.
|
| SpdySessionPool::TimeFunc time_func;
|
| - // This SPDY proxy is allowed to push resources from origins that are
|
| - // different from those of their associated streams.
|
| - std::string trusted_spdy_proxy;
|
| + // |trusted_spdy_proxy_provider| provides a trusted SPDY proxy which is
|
| + // allowed to push HTTP resources from origins that are different from those
|
| + // of their associated streams in non-incognito sessions.
|
| + base::WeakPtr<TrustedSpdyProxyProvider> trusted_spdy_proxy_provider;
|
| // URLs to exclude from forced SPDY.
|
| std::set<HostPortPair> forced_spdy_exclusions;
|
| // Process Alt-Svc headers.
|
|
|