Index: net/spdy/spdy_session_pool.cc |
diff --git a/net/spdy/spdy_session_pool.cc b/net/spdy/spdy_session_pool.cc |
index 8f0de903c6854ac4bf79218d0eec67067ac709b1..b5496b98c88ee756d576153df3e5ab4ad6d641b6 100644 |
--- a/net/spdy/spdy_session_pool.cc |
+++ b/net/spdy/spdy_session_pool.cc |
@@ -37,7 +37,8 @@ SpdySessionPool::SpdySessionPool( |
bool enable_compression, |
bool enable_ping_based_connection_checking, |
NextProto default_protocol, |
- size_t stream_initial_recv_window_size, |
+ size_t session_max_recv_window_size, |
+ size_t stream_max_recv_window_size, |
size_t initial_max_concurrent_streams, |
size_t max_concurrent_streams_limit, |
SpdySessionPool::TimeFunc time_func, |
@@ -54,15 +55,14 @@ SpdySessionPool::SpdySessionPool( |
enable_ping_based_connection_checking), |
// TODO(akalin): Force callers to have a valid value of |
// |default_protocol_|. |
- default_protocol_( |
- (default_protocol == kProtoUnknown) ? |
- kProtoSPDY31 : default_protocol), |
- stream_initial_recv_window_size_(stream_initial_recv_window_size), |
+ default_protocol_((default_protocol == kProtoUnknown) ? kProtoSPDY31 |
+ : default_protocol), |
+ session_max_recv_window_size_(session_max_recv_window_size), |
+ stream_max_recv_window_size_(stream_max_recv_window_size), |
initial_max_concurrent_streams_(initial_max_concurrent_streams), |
max_concurrent_streams_limit_(max_concurrent_streams_limit), |
time_func_(time_func), |
- trusted_spdy_proxy_( |
- HostPortPair::FromString(trusted_spdy_proxy)) { |
+ trusted_spdy_proxy_(HostPortPair::FromString(trusted_spdy_proxy)) { |
DCHECK(default_protocol_ >= kProtoSPDYMinimumVersion && |
default_protocol_ <= kProtoSPDYMaximumVersion); |
NetworkChangeNotifier::AddIPAddressObserver(this); |
@@ -98,21 +98,14 @@ base::WeakPtr<SpdySession> SpdySessionPool::CreateAvailableSessionFromSocket( |
UMA_HISTOGRAM_ENUMERATION( |
"Net.SpdySessionGet", IMPORTED_FROM_SOCKET, SPDY_SESSION_GET_MAX); |
- scoped_ptr<SpdySession> new_session( |
- new SpdySession(key, |
- http_server_properties_, |
- transport_security_state_, |
- verify_domain_authentication_, |
- enable_sending_initial_data_, |
- enable_compression_, |
- enable_ping_based_connection_checking_, |
- default_protocol_, |
- stream_initial_recv_window_size_, |
- initial_max_concurrent_streams_, |
- max_concurrent_streams_limit_, |
- time_func_, |
- trusted_spdy_proxy_, |
- net_log.net_log())); |
+ scoped_ptr<SpdySession> new_session(new SpdySession( |
+ key, http_server_properties_, transport_security_state_, |
+ verify_domain_authentication_, enable_sending_initial_data_, |
+ enable_compression_, enable_ping_based_connection_checking_, |
+ default_protocol_, session_max_recv_window_size_, |
+ stream_max_recv_window_size_, initial_max_concurrent_streams_, |
+ max_concurrent_streams_limit_, time_func_, trusted_spdy_proxy_, |
+ net_log.net_log())); |
new_session->InitializeWithSocket( |
connection.Pass(), this, is_secure, certificate_error_code); |