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

Unified Diff: net/spdy/spdy_session_pool.cc

Issue 2521573006: Server push cancellation: change the ownership of ServerPushDelegate to HttpNetworkSession. (Closed)
Patch Set: address comments Created 4 years, 1 month 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 40c6615617faa8529c030fc12a7da1a930a8e641..e2e76ab2cdc7186d4a8b988753a4ee36a7fcf5a7 100644
--- a/net/spdy/spdy_session_pool.cc
+++ b/net/spdy/spdy_session_pool.cc
@@ -54,6 +54,7 @@ SpdySessionPool::SpdySessionPool(
session_max_recv_window_size_(session_max_recv_window_size),
stream_max_recv_window_size_(stream_max_recv_window_size),
time_func_(time_func),
+ push_delegate_(nullptr),
proxy_delegate_(proxy_delegate) {
NetworkChangeNotifier::AddIPAddressObserver(this);
if (ssl_config_service_.get())
@@ -90,7 +91,7 @@ base::WeakPtr<SpdySession> SpdySessionPool::CreateAvailableSessionFromSocket(
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_,
- proxy_delegate_, net_log.net_log()));
+ 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