| Index: net/spdy/spdy_session_pool.h
|
| diff --git a/net/spdy/spdy_session_pool.h b/net/spdy/spdy_session_pool.h
|
| index 0b0f97edb81d0c26d3e117a1c51238efe2070340..32b34c0d4a36071924a8e6637fc6f659b629cd58 100644
|
| --- a/net/spdy/spdy_session_pool.h
|
| +++ b/net/spdy/spdy_session_pool.h
|
| @@ -36,6 +36,7 @@ class HostResolver;
|
| class HttpServerProperties;
|
| class SpdySession;
|
| class TransportSecurityState;
|
| +class TrustedSpdyProxyProvider;
|
|
|
| // This is a very simple pool for open SpdySessions.
|
| class NET_EXPORT SpdySessionPool
|
| @@ -60,7 +61,8 @@ class NET_EXPORT SpdySessionPool
|
| size_t stream_max_recv_window_size,
|
| size_t initial_max_concurrent_streams,
|
| SpdySessionPool::TimeFunc time_func,
|
| - const std::string& trusted_spdy_proxy);
|
| + const base::WeakPtr<TrustedSpdyProxyProvider>&
|
| + trusted_spdy_proxy_provider);
|
| ~SpdySessionPool() override;
|
|
|
| // In the functions below, a session is "available" if this pool has
|
| @@ -217,9 +219,10 @@ class NET_EXPORT SpdySessionPool
|
| size_t initial_max_concurrent_streams_;
|
| TimeFunc time_func_;
|
|
|
| - // This SPDY proxy is allowed to push resources from origins that are
|
| - // different from those of their associated streams.
|
| - HostPortPair trusted_spdy_proxy_;
|
| + // Returns the trusted SPDY proxy which is allowed to push resources from
|
| + // origins that are different from those of their associated streams in
|
| + // non-incognito sessions.
|
| + const base::WeakPtr<TrustedSpdyProxyProvider> trusted_spdy_proxy_provider_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SpdySessionPool);
|
| };
|
|
|