| Index: net/spdy/spdy_session_pool.cc
|
| diff --git a/net/spdy/spdy_session_pool.cc b/net/spdy/spdy_session_pool.cc
|
| index 120887859ea391787fc47a550f9c1f1067f61e40..d9458fef83bf45e938757a1049895011ba534b29 100644
|
| --- a/net/spdy/spdy_session_pool.cc
|
| +++ b/net/spdy/spdy_session_pool.cc
|
| @@ -11,6 +11,7 @@
|
| #include "base/profiler/scoped_tracker.h"
|
| #include "base/values.h"
|
| #include "net/base/address_list.h"
|
| +#include "net/base/trusted_spdy_proxy_provider.h"
|
| #include "net/http/http_network_session.h"
|
| #include "net/http/http_server_properties.h"
|
| #include "net/spdy/spdy_session.h"
|
| @@ -41,7 +42,7 @@ SpdySessionPool::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)
|
| : http_server_properties_(http_server_properties),
|
| transport_security_state_(transport_security_state),
|
| ssl_config_service_(ssl_config_service),
|
| @@ -59,7 +60,7 @@ SpdySessionPool::SpdySessionPool(
|
| stream_max_recv_window_size_(stream_max_recv_window_size),
|
| initial_max_concurrent_streams_(initial_max_concurrent_streams),
|
| time_func_(time_func),
|
| - trusted_spdy_proxy_(HostPortPair::FromString(trusted_spdy_proxy)) {
|
| + trusted_spdy_proxy_provider_(trusted_spdy_proxy_provider) {
|
| DCHECK(default_protocol_ >= kProtoSPDYMinimumVersion &&
|
| default_protocol_ <= kProtoSPDYMaximumVersion);
|
| NetworkChangeNotifier::AddIPAddressObserver(this);
|
| @@ -101,7 +102,7 @@ base::WeakPtr<SpdySession> SpdySessionPool::CreateAvailableSessionFromSocket(
|
| enable_compression_, enable_ping_based_connection_checking_,
|
| default_protocol_, session_max_recv_window_size_,
|
| stream_max_recv_window_size_, initial_max_concurrent_streams_, time_func_,
|
| - trusted_spdy_proxy_, net_log.net_log()));
|
| + trusted_spdy_proxy_provider_, net_log.net_log()));
|
|
|
| new_session->InitializeWithSocket(std::move(connection), this, is_secure,
|
| certificate_error_code);
|
|
|