Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1715)

Unified Diff: net/spdy/spdy_session_pool.cc

Issue 2600973002: Implement HTTP/2 settings field trial parameters. (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/spdy/spdy_session_pool.cc
diff --git a/net/spdy/spdy_session_pool.cc b/net/spdy/spdy_session_pool.cc
index 919a8d60c5e3a23d27c6f552ed2d5f5709eb093c..78f6ce528c07a94efe8337c1e03130062deece07 100644
--- a/net/spdy/spdy_session_pool.cc
+++ b/net/spdy/spdy_session_pool.cc
@@ -45,7 +45,7 @@ SpdySessionPool::SpdySessionPool(
TransportSecurityState* transport_security_state,
bool enable_ping_based_connection_checking,
size_t session_max_recv_window_size,
- size_t stream_max_recv_window_size,
+ const SettingsMap& settings,
SpdySessionPool::TimeFunc time_func,
ProxyDelegate* proxy_delegate)
: http_server_properties_(http_server_properties),
@@ -56,7 +56,7 @@ SpdySessionPool::SpdySessionPool(
enable_ping_based_connection_checking_(
enable_ping_based_connection_checking),
session_max_recv_window_size_(session_max_recv_window_size),
- stream_max_recv_window_size_(stream_max_recv_window_size),
+ settings_(settings),
time_func_(time_func),
push_delegate_(nullptr),
proxy_delegate_(proxy_delegate) {
@@ -92,11 +92,11 @@ base::WeakPtr<SpdySession> SpdySessionPool::CreateAvailableSessionFromSocket(
UMA_HISTOGRAM_ENUMERATION(
"Net.SpdySessionGet", IMPORTED_FROM_SOCKET, SPDY_SESSION_GET_MAX);
- std::unique_ptr<SpdySession> new_session(new SpdySession(
+ auto new_session = base::MakeUnique<SpdySession>(
key, http_server_properties_, transport_security_state_,
enable_sending_initial_data_, enable_ping_based_connection_checking_,
- session_max_recv_window_size_, stream_max_recv_window_size_, time_func_,
- push_delegate_, proxy_delegate_, net_log.net_log()));
+ session_max_recv_window_size_, settings_, time_func_, push_delegate_,
+ proxy_delegate_, net_log.net_log());
new_session->InitializeWithSocket(std::move(connection), this, is_secure);

Powered by Google App Engine
This is Rietveld 408576698