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

Unified Diff: net/spdy/spdy_session_pool.cc

Issue 2521573006: Server push cancellation: change the ownership of ServerPushDelegate to HttpNetworkSession. (Closed)
Patch Set: rebase 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
« no previous file with comments | « net/spdy/spdy_session_pool.h ('k') | net/spdy/spdy_session_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_session_pool.cc
diff --git a/net/spdy/spdy_session_pool.cc b/net/spdy/spdy_session_pool.cc
index d694ab54fc1159fa3beaa5278441bd4ae58ee562..919a8d60c5e3a23d27c6f552ed2d5f5709eb093c 100644
--- a/net/spdy/spdy_session_pool.cc
+++ b/net/spdy/spdy_session_pool.cc
@@ -58,6 +58,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())
@@ -95,7 +96,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);
« no previous file with comments | « net/spdy/spdy_session_pool.h ('k') | net/spdy/spdy_session_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698